Auths: in plaintext authenticator, fix parsing of consecutive circuflex. Bug 2687

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

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index d835db9edfa961036999ed9a6b80148c61ff96e3..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.
 # 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'."
 
 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'."


@@ -11,7 +13,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
 # 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
 everything:            spec.pdf        spec.ps         spec.txt \
                                filter.pdf      filter.ps filter.txt \
                                exim.8


@@ -33,7 +35,7 @@ local_params: FORCE GenLocalParams
        trap 'rm -f $$tmp' EXIT; \
        tmp=`mktemp`; \
        ./GenLocalParams $$tmp; \
        trap 'rm -f $$tmp' EXIT; \
        tmp=`mktemp`; \
        ./GenLocalParams $$tmp; \

-       cmp -s $@ $$tmp || mv $$tmp $@
+       cmp -s $@ $$tmp || mv -f $$tmp $@

 
 ############################### FILTER #################################
 
 
 ############################### FILTER #################################
 


@@ -96,6 +98,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
                 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
 
              LC_ALL=C w3m -dump filter-txt.html | ./Tidytxt >filter.txt
              ./SanityTestText filter.txt
 


@@ -116,7 +119,7 @@ filter.info:  filter-info.xml
 ################################ SPEC ##################################
 
 spec.xml:      spec.xfpt local_params
 ################################ 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
 
 spec-pr.xml:   spec.xml Pre-xml
               ./Pre-xml -optbreak <spec.xml >spec-pr.xml


@@ -175,16 +178,18 @@ spec.pdf: sdop-spec.pdf
 
 spec-txt.html:     spec-txt.xml \
                MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
 
 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; }
 
 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; }

-               w3m -dump $< | ./Tidytxt -utf8 >$@
+               command -v w3m >/dev/null
+               w3m -dump spec-txt.html | ./Tidytxt -utf8 >$@

 
 spec.txt: spec-txt.html Tidytxt
 
 spec.txt: spec-txt.html Tidytxt

-             LC_ALL=C w3m -dump $< | ./Tidytxt >$@
+             command -v w3m >/dev/null
+             LC_ALL=C w3m -dump spec-txt.html | ./Tidytxt >$@

              ./SanityTestText spec.txt
 
 
              ./SanityTestText spec.txt
 
 


@@ -270,6 +275,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
                 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
              w3m -dump test-txt.html | Tidytxt >test.txt
 
 # I have not found a way of making docbook2texi write its output anywhere