Added an echo to master makefile to let DocBook Project developers

know they can use xsltproc to build.
Also, added targets to copy extensions and gentext dirs over to
use in the build.

diff --git a/xsl/Makefile b/xsl/Makefile
index d1c4a2f67480418b191d89341023e6c875e08c5f..3043ae9192d804431f11758f89d52bdc76dca075 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -7,12 +7,12 @@ DISTRO=xsl
 
 # value of DISTRIB_DEPENDS is a space-separated list of any
 # targets for this distro's "distrib" target to depend on
-DISTRIB_DEPENDS = doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf
+DISTRIB_DEPENDS = gentext doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf
 
 # value of ZIP_EXCLUDES is a space-separated list of any file or
 # directory names (shell wildcards OK) that should be excluded
 # from the zip file and tarball for the release
-DISTRIB_EXCLUDES = extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$ tools/xsl xhtml/html2xhtml.xsl
+DISTRIB_EXCLUDES = gentext/$$ extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$ tools/xsl xhtml/html2xhtml.xsl
 
 # value of DISTRIB_PACKAGES is a space-separated list of any
 # directory names that should be packaged as separate zip/tar
@@ -23,11 +23,21 @@ DISTRIB_PACKAGES = doc
 URILIST = \
 .\ http://docbook.sourceforge.net/release/xsl/current/
 
-DIRS=extensions common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website
+DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website
 
 .PHONY: distrib clean doc docsrc xhtml
 
 all: base xhtml
+# If you're annoyed about getting the reminder that it's possible
+# to use xsltproc to build, delete the following conditional from
+# this makefile.
+ifeq (,$(findstring xsltproc,$(XSLT)))
+       @echo
+       @echo "-----------------------------------------------------------------"
+       @echo "   To build using xsltproc, run make as follows:"
+       @echo "     make XSLT=\"\$$DOCBOOK_SVN/buildtools/xslt -xsltproc\""
+       @echo "-----------------------------------------------------------------"
+endif
 
 base: litprog
        for i in $(DIRS) __bogus__; do \
@@ -48,12 +58,21 @@ docsrc: base
 doc: docsrc
        $(MAKE) -C doc RELVER=$(RELVER)
 
+extensions:
+       make -C ../xsl-java
+       cp -pR ../xsl-java .
+
+gentext:
+       cp -pR ../gentext .
+
 clean:
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
                        echo "$(MAKE) clean -C $$i"; $(MAKE) clean -C $$i; \
                fi \
        done
+       $(RM) -r extensions
+       $(RM) -r gentext
        $(MAKE) clean -C xhtml
        $(MAKE) clean -C doc
        $(MAKE) clean -C docsrc