From: Keith Fahlgren <abdelazer@users.sourceforge.net>
Date: Sun, 1 Jun 2008 21:06:45 +0000 (+0000)
Subject: Use DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=536f55809b7e43b895bb2ecf47c7a027e31059e9;p=docbook-dsssl

Use DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER
---

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 1fe9420d3..78d04f65b 100644
--- 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 780df533e..dea94429e 100644
--- 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 016a8ab28..573712aa4 100644
--- 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 0edc47ab6..6b045d74a 100644
--- 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 7de7a4c28..6952171d0 100644
--- 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