Taint: fix off-by-one in is_tainted(). Bug 2634

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

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index 10df9180a3f970e38420d59ddc030ebe4160ed72..97f30f1e1ae92f90ecf6049f7acb5f03942a8795 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,4 +1,6 @@
 # Make file for Exim documentation from xfpt source.
+# Copyright (c) The Exim Maintainers 2020
+export LC_ALL=C
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
              @echo "** or 'test', and y is 'xml', 'fo', 'ps', 'pdf', 'html', 'txt', or 'info'."
@@ -33,7 +35,7 @@ local_params: FORCE GenLocalParams
        trap 'rm -f $$tmp' EXIT; \
        tmp=`mktemp`; \
        ./GenLocalParams $$tmp; \
-       cmp -s $@ $$tmp || mv $$tmp $@
+       cmp -s $@ $$tmp || mv -f $$tmp $@
 
 ############################### FILTER #################################
 
@@ -117,7 +119,7 @@ filter.info:  filter-info.xml
 ################################ SPEC ##################################
 
 spec.xml:      spec.xfpt local_params
-              xfpt $<
+              xfpt spec.xfpt
 
 spec-pr.xml:   spec.xml Pre-xml
               ./Pre-xml -optbreak <spec.xml >spec-pr.xml
@@ -176,18 +178,18 @@ spec.pdf: sdop-spec.pdf
 
 spec-txt.html:     spec-txt.xml \
                MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
-             xmlto -x MyStyle-txt-html.xsl html-nochunks $<
+             xmlto -x MyStyle-txt-html.xsl html-nochunks spec-txt.xml
 
 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 >$@
+               w3m -dump spec-txt.html | ./Tidytxt -utf8 >$@
 
 spec.txt: spec-txt.html Tidytxt
              command -v w3m >/dev/null
-             LC_ALL=C w3m -dump $< | ./Tidytxt >$@
+             LC_ALL=C w3m -dump spec-txt.html | ./Tidytxt >$@
              ./SanityTestText spec.txt