Docs: expand/reword entry on cutthrough delivery option

[exim.git] / doc / doc-docbook / Makefile

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index d2cb9fe865c8347937cec06726d4aa2cb9634146..14bea8e6bb059d9a741e32829fb05257212b82fc 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,5 +1,3 @@
-# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.12 2007/12/01 15:53:55 nm4 Exp $
-
 # Make file for Exim documentation from xfpt source.
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
@@ -12,8 +10,10 @@ notarget:;    @echo "** You must specify a target, in the form x.y, where x is '
 #
 # Generate all the documentation files...
 #
-everything:            spec.pdf        spec.ps         spec.html       spec.info       spec.txt \
-                               filter.pdf      filter.ps       filter.html filter.info filter.txt \
+## removed info files as I cannot generate them -  spec.info filter.info
+## removed html files as superceded by new website code
+everything:            spec.pdf        spec.ps         spec.txt \
+                               filter.pdf      filter.ps filter.txt \
                                exim.8
 
 ############################## MAN PAGE ################################
@@ -23,18 +23,18 @@ exim.8:       spec.xml x2man
 
 ########################################################################
 
+.PHONY: local_params
+local_params:
+       ./GenLocalParams $@
 
 ############################### FILTER #################################
 
-filter.xml:      filter.xfpt
+filter.xml:      local_params filter.xfpt
                 xfpt filter.xfpt
 
 filter-pr.xml:   filter.xml Pre-xml
                 ./Pre-xml -bookinfo <filter.xml >filter-pr.xml
 
-filter-html.xml: filter.xml Pre-xml
-                ./Pre-xml -html <filter.xml >filter-html.xml
-
 filter-txt.xml:  filter.xml Pre-xml
                 ./Pre-xml -ascii -html -quoteliteral <filter.xml >filter-txt.xml
 
@@ -84,18 +84,12 @@ filter.pdf: sdop-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
-             xmlto -x MyStyle-nochunk-html.xsl html-nochunks filter-html.xml
-             /bin/mv -f filter-html.html filter.html
-             ./TidyHTML-filter
-
 filter.txt:   filter-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
                 MyStyle.xsl
              /bin/rm -rf filter-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks filter-txt.xml
              w3m -dump filter-txt.html | ./Tidytxt >filter.txt
+             ./SanityTestText filter.txt
 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
@@ -113,16 +107,12 @@ filter.info:  filter-info.xml
 
 ################################ SPEC ##################################
 
-spec.xml:      spec.xfpt
+spec.xml:      local_params spec.xfpt
               xfpt spec.xfpt
 
 spec-pr.xml:   spec.xml Pre-xml
               ./Pre-xml -optbreak <spec.xml >spec-pr.xml
 
-spec-html.xml: spec.xml Pre-xml
-              ./Pre-xml -html -oneindex \
-                <spec.xml >spec-html.xml
-
 spec-txt.xml:  spec.xml Pre-xml
               ./Pre-xml -ascii -html -noindex -quoteliteral \
                 <spec.xml >spec-txt.xml
@@ -175,17 +165,12 @@ spec.pdf: sdop-spec.pdf
 ###
 ###
 
-spec.html:    spec-html.xml TidyHTML-spec MyStyle-chunk-html.xsl \
-                MyStyle-html.xsl MyStyle.xsl
-             /bin/rm -rf spec_html
-             xmlto -x MyStyle-chunk-html.xsl -o spec_html html spec-html.xml
-             ./TidyHTML-spec
-
 spec.txt:     spec-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
                 MyStyle.xsl
              /bin/rm -rf spec-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks spec-txt.xml
              w3m -dump spec-txt.html | ./Tidytxt >spec.txt
+             ./SanityTestText spec.txt
 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
@@ -265,12 +250,6 @@ test.pdf: sdop-test.pdf
 ###
 
 
-test.html:    test-html.xml MyStyle-nochunk-html.xsl MyStyle-html.xsl \
-                MyStyle.xsl
-             /bin/rm -rf test.html test-html.html
-             xmlto -x MyStyle-nochunk-html.xsl html-nochunks test-html.xml
-             /bin/mv -f test-html.html test.html
-
 test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
                 MyStyle.xsl
              /bin/rm -rf test-txt.html
@@ -290,11 +269,24 @@ test.info:    test-info.xml
 ########################################################################
 
 
+############################## OS FIXUP ################################
+
+# Yes, we've advanced so far in text processing that we now have to
+# hardcode in complete paths and so become dependent upon exactly where
+# files were installed for xsl:import.  Which of course varies by OS.
+
+os-fixup:
+       ./OS-Fixups
+
+########################################################################
+
+
 ################################ CLEAN #################################
 
 clean:; /bin/rm -rf exim.8 \
              filter*.xml spec*.xml test*.xml \
-             *.fo *.html *.pdf *.ps \
+             *.fo *.pdf *.ps \
+             filter*.html spec*.html test*.html \
              filter*.txt spec*.txt test*.txt \
              *.info* *.texinfo *.texi