From efab32198fdf1a469b2d8b28dcf264d6fc7b8e65 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 12 Apr 2019 16:16:57 +0200 Subject: [PATCH] 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 :wheel. The following mv /tmp/ to an existing file with other permissions fails for the non-privileged user. This cherry was picked just for the sake of some build farm animals. --- doc/doc-docbook/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile index 10df9180a..df7c6f051 100644 --- 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; \ - cmp -s $@ $$tmp || mv $$tmp $@ + cmp -s $@ $$tmp || mv -f $$tmp $@ ############################### FILTER ################################# @@ -117,7 +117,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-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 - 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 -- 2.30.2