X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d1e83bff479907ea191e6e4e0b472edf53c224a3..deca074a0983add921037815e8dd3aa260dbacfd:/doc/doc-docbook/Makefile

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index c2e5593b1..38e6ebff3 100644
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,4 +1,4 @@
-# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.3 2005/11/15 16:10:50 ph10 Exp $
+# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.6 2005/12/20 15:45:02 ph10 Exp $
 
 # Make file for Exim documentation from Asciidoc source.
 
@@ -22,29 +22,31 @@ filter.xml:   filter.ascd MyAsciidoc.conf
 	      asciidoc -d book -b docbook -f MyAsciidoc.conf filter.ascd
 
 filter-fo.xml: filter.xml Pre-xml
-	      Pre-xml -bookinfo <filter.xml >filter-fo.xml
+	      ./Pre-xml -bookinfo <filter.xml >filter-fo.xml
 
 filter-html.xml: filter.xml Pre-xml
-	      Pre-xml -html <filter.xml >filter-html.xml
+	      ./Pre-xml -html <filter.xml >filter-html.xml
 
 filter-txt.xml: filter.xml Pre-xml
-	      Pre-xml -ascii -html <filter.xml >filter-txt.xml
+	      ./Pre-xml -ascii -html <filter.xml >filter-txt.xml
 
 filter.fo:    filter-fo.xml MyStyle-filter-fo.xsl MyStyle-fo.xsl MyStyle.xsl
 	      /bin/rm -rf filter.fo filter-fo.fo
 	      xmlto -x MyStyle-filter-fo.xsl fo filter-fo.xml
 	      /bin/mv -f filter-fo.fo filter.fo
 
+# Do not use pdf2ps from the PDF version; better PS is generated directly.
+
 filter.ps:    filter.fo
 	      fop filter.fo -ps filter-tmp.ps
 	      mv filter-tmp.ps filter.ps
 
-#filter.pdf:   filter.fo
-#	       fop filter.fo -pdf filter-tmp.pdf
-#	       mv filter-tmp.pdf filter.pdf
+# Do not use ps2pdf from the PS version; better PDF is generated directly. It
+# contains cross links etc.
 
-filter.pdf:   filter.ps
-	      ps2pdf filter.ps filter.pdf
+filter.pdf:   filter.fo
+	      fop filter.fo -pdf filter-tmp.pdf
+	      mv filter-tmp.pdf filter.pdf
 
 filter.html:  filter-html.xml TidyHTML-filter MyStyle-nochunk-html.xsl MyStyle-html.xsl MyStyle.xsl
 	      /bin/rm -rf filter.html filter-html.html
@@ -77,29 +79,31 @@ spec.xml:     spec.ascd MyAsciidoc.conf
 	      asciidoc -d book -b docbook -f MyAsciidoc.conf spec.ascd
 
 spec-fo.xml:  spec.xml Pre-xml
-	      Pre-xml <spec.xml >spec-fo.xml
+	      ./Pre-xml <spec.xml >spec-fo.xml
 
 spec-html.xml: spec.xml Pre-xml
-	      Pre-xml -abstract -html -oneindex <spec.xml >spec-html.xml
+	      ./Pre-xml -abstract -html -oneindex <spec.xml >spec-html.xml
 
 spec-txt.xml: spec.xml Pre-xml
-	      Pre-xml -abstract -ascii -html -noindex <spec.xml >spec-txt.xml
+	      ./Pre-xml -abstract -ascii -html -noindex <spec.xml >spec-txt.xml
 
 spec.fo:      spec-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl MyTitleStyle.xsl
 	      /bin/rm -rf spec.fo spec-fo.fo
 	      xmlto -x MyStyle-spec-fo.xsl fo spec-fo.xml
 	      /bin/mv -f spec-fo.fo spec.fo
 
+# Do not use pdf2ps from the PDF version; better PS is generated directly.
+
 spec.ps:      spec.fo
 	      FOP_OPTS=-Xmx512m fop spec.fo -ps spec-tmp.ps
 	      mv spec-tmp.ps spec.ps
 
-#spec.pdf:     spec.fo
-#	       FOP_OPTS=-Xmx512m fop spec.fo -pdf spec-tmp.pdf
-#	       mv spec-tmp.pdf spec.pdf
+# Do not use ps2pdf from the PS version; better PDF is generated directly. It
+# contains cross links etc.
 
-spec.pdf:     spec.ps
-	      ps2pdf spec.ps spec.pdf
+spec.pdf:     spec.fo
+	      FOP_OPTS=-Xmx512m fop spec.fo -pdf spec-tmp.pdf
+	      mv spec-tmp.pdf spec.pdf
 
 spec.html:    spec-html.xml TidyHTML-spec MyStyle-chunk-html.xsl MyStyle-html.xsl MyStyle.xsl
 	      /bin/rm -rf spec.html
@@ -146,16 +150,18 @@ test.fo:      test-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl MyTitle
 	      xmlto -x MyStyle-spec-fo.xsl fo test-fo.xml
 	      /bin/mv -f test-fo.fo test.fo
 
+# Do not use pdf2ps from the PDF version; better PS is generated directly.
+
 test.ps:      test.fo
 	      fop test.fo -ps test-tmp.ps
 	      mv test-tmp.ps test.ps
 
-#test.pdf:     test.fo
-#	       fop test.fo -pdf test-tmp.pdf
-#	       mv test-tmp.pdf test.pdf
+# Do not use ps2pdf from the PS version; better PDF is generated directly. It
+# contains cross links etc.
 
-test.pdf:     test.ps
-	      ps2pdf test.ps test.pdf
+test.pdf:     test.fo
+	      fop test.fo -pdf test-tmp.pdf
+	      mv test-tmp.pdf test.pdf
 
 test.html:    test-html.xml MyStyle-nochunk-html.xsl MyStyle-html.xsl MyStyle.xsl
 	      /bin/rm -rf test.html test-html.html