Use DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 1fe9420d30a423d29dddf52d4469c33c2fc40888..78d04f65b1d84a303ee8d220d51540af007d0877 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -1,4 +1,4 @@
-include ../../releasetools/Variables.mk
+include $(DOCBOOK_SVN)/releasetools/Variables.mk
 
 XJPARSEFLAGS= -E 0 -w
 FO_BUILDER=saxon
@@ -68,7 +68,16 @@ reference.fo: ../docsrc/reference.xml.included $(REFERENCEFOXSL) fo/page.png $(D
        $(DOCBOOK_SVN)/buildtools/xslt -$(FO_BUILDER) $< $(REFERENCEFOXSL) > $@
 
 reference.pdf: reference.fo
+ifeq ($(PDF_MAKER),dblatex)
+       -$(DBLATEX) $(DBLATEXFLAGS) \
+         -p $(DBX_STYLE) \
+         -o $@ \
+    $< 
+else
+ifeq ($(PDF_MAKER),xep)
        $(XEP) $(XEPFLAGS) $<
+endif
+endif
 
 reference.txt.html: ../docsrc/reference.xml.included $(REFERENCETXTXSL) $(DOC_SOURCE_XML_FILES)
        $(XSLT) $< $(REFERENCETXTXSL) > $@

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 780df533eef6d3ca668688da07a84499511c143e..dea94429e5a13a0fa58378c31ebf5065322ec476 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,4 +1,4 @@
-include ../../releasetools/Variables.mk
+include $(DOCBOOK_SVN)/releasetools/Variables.mk
 
 XJPARSEFLAGS= -E 0 -w
 

diff --git a/xsl/extensions/Makefile b/xsl/extensions/Makefile
index 016a8ab287035b7b0dac686345329004707c126c..573712aa48b314379d272d129ef74a2867de9d74 100644 (file)
--- a/xsl/extensions/Makefile
+++ b/xsl/extensions/Makefile
@@ -2,25 +2,25 @@
 
 all: saxon65.jar xalan27.jar xslt.py docbook.py README.LIBXSLT
 
-saxon65.jar: ../../xsl-saxon/saxon65.jar
+saxon65.jar: $(DOCBOOK_SVN)/xsl-saxon/saxon65.jar
        cp -p $^ $@
 
-xalan27.jar: ../../xsl-xalan/xalan27.jar
+xalan27.jar: $(DOCBOOK_SVN)/xsl-xalan/xalan27.jar
        cp -p $^ $@
 
-../../xsl-saxon/saxon65.jar: $(wildcard ../../xsl-saxon/src/com/nwalsh/saxon/*.java) 
+$(DOCBOOK_SVN)/xsl-saxon/saxon65.jar: $(wildcard ../../xsl-saxon/src/com/nwalsh/saxon/*.java) 
        $(MAKE) -C $(dir $@)
 
-../../xsl-xalan/xalan27.jar: $(wildcard ../../xsl-xalan/src/com/nwalsh/xalan/*.java) 
+$(DOCBOOK_SVN)/xsl-xalan/xalan27.jar: $(wildcard ../../xsl-xalan/src/com/nwalsh/xalan/*.java) 
        $(MAKE) -C $(dir $@)
 
-xslt.py: ../../xsl-libxslt/python/xslt.py
+xslt.py: $(DOCBOOK_SVN)/xsl-libxslt/python/xslt.py
        cp -p $^ $@
 
-docbook.py: ../../xsl-libxslt/python/docbook.py
+docbook.py: $(DOCBOOK_SVN)/xsl-libxslt/python/docbook.py
        cp -p $^ $@
 
-README.LIBXSLT: ../../xsl-libxslt/python/README.LIBXSLT
+README.LIBXSLT: $(DOCBOOK_SVN)/xsl-libxslt/python/README.LIBXSLT
        cp -p $^ $@
 
 clean:

diff --git a/xsl/manpages/Makefile b/xsl/manpages/Makefile
index 0edc47ab6be7a7dfb780488a411c081064371ed1..6b045d74a6f7ebbb1054e9d1704e0c2f14e0b4ae 100644 (file)
--- a/xsl/manpages/Makefile
+++ b/xsl/manpages/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl profile-docbook.xsl html-synop.xsl

diff --git a/xsl/xhtml/Makefile b/xsl/xhtml/Makefile
index 7de7a4c288a837e4abb2d6f1aa681369a5ede8cb..6952171d058d664f7a0156090ea9231bda7d6d32 100644 (file)
--- a/xsl/xhtml/Makefile
+++ b/xsl/xhtml/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 all: xsl-files profile-docbook.xsl profile-chunk.xsl profile-onechunk.xsl