Docs: Remove GNUmake idioms from Makefile, give power to "mv"

On at least one *BSD system, /tmp is owned by root:wheel and
files created there are owned by <creator>:wheel. The following
mv /tmp/<tmpfile> to an existing file with other permissions fails
for the non-privileged user.

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index 10df9180a3f970e38420d59ddc030ebe4160ed72..df7c6f05166fe6f287000e221ea4f30b26caccb4 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -33,7 +33,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 #################################
 


@@ -117,7 +117,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


@@ -176,18 +176,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; }
                command -v w3m >/dev/null
 
 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
 
 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
 
 
              ./SanityTestText spec.txt