TLS: refactor client-start interface

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

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index f456f80c929c08bb75d69143bb8b9d89c80d3fed..10df9180a3f970e38420d59ddc030ebe4160ed72 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -11,7 +11,7 @@ notarget:;    @echo "** You must specify a target, in the form x.y, where x is '
 # Generate all the documentation files...
 #
 ## removed info files as I cannot generate them -  spec.info filter.info
-## removed html files as superceded by new website code
+## removed html files as superseded by new website code
 everything:            spec.pdf        spec.ps         spec.txt \
                                filter.pdf      filter.ps filter.txt \
                                exim.8
@@ -23,7 +23,7 @@ exim.8:       spec.xml x2man
 
 ########################################################################
 
-# .PHONY doesn't work here, because it forces a rebuild of all dependend
+# .PHONY doesn't work here, because it forces a rebuild of all dependent
 # targets, always. It sets the internal timestamp of its target to
 # now().
 # But it may happen that local_params does not change
@@ -96,6 +96,7 @@ 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
+             command -v w3m >/dev/null
              LC_ALL=C w3m -dump filter-txt.html | ./Tidytxt >filter.txt
              ./SanityTestText filter.txt
 
@@ -181,9 +182,11 @@ spec.utf8: spec-txt.html Tidytxt
                @grep -iq 'LC_CTYPE=.*utf-\?8' local_params || { \
                        echo 'your current locale does not support UTF-8' >&2; \
                        false; }
+               command -v w3m >/dev/null
                w3m -dump $< | ./Tidytxt -utf8 >$@
 
 spec.txt: spec-txt.html Tidytxt
+             command -v w3m >/dev/null
              LC_ALL=C w3m -dump $< | ./Tidytxt >$@
              ./SanityTestText spec.txt
 
@@ -270,6 +273,7 @@ test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
                 MyStyle.xsl
              /bin/rm -rf test-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks test-txt.xml
+             command -v w3m >/dev/null
              w3m -dump test-txt.html | Tidytxt >test.txt
 
 # I have not found a way of making docbook2texi write its output anywhere