From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 2 Jul 2012 18:58:23 +0000 (+0200)
Subject: contrib: simple improvements to check-html
X-Git-Tag: v1.12b~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18dac9077caa49f69aa39e306b146ae700e14e9c;p=thirdparty%2Fautomake.git

contrib: simple improvements to check-html

Related to automake bug#11287.

* contrib/t/check-html.am (.log.html): Do not look for $RST2HTML in
the environment, looking for $(RST2HTML) should be enough (also, the
pre-existing code was broken, because it single-quoted $RST2HTML).
Fix the loop-and-search implementation to be more similar to the
one in 'contrib/t/parallel-tests-html.sh'.  Prefer 'mv -f' over bare
'mv'.  Do not break the recipe in

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/contrib/check-html.am b/contrib/check-html.am
index 4495ac05c..47e4f47ec 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -29,18 +29,16 @@ mostlyclean-check-html:
 	rm -f $(TEST_SUITE_HTML)
 
 .log.html:
-	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\
-	for r2h in $$list; do						\
-	  if ($$r2h --version) >/dev/null 2>&1; then			\
-	    R2H=$$r2h;							\
-	  fi;								\
-	done;								\
-	if test -z "$$R2H"; then					\
-	  echo >&2 "cannot find rst2html, cannot create $@";		\
+	@list='$(RST2HTML) rst2html rst2html.py';			\
+	while :; do							\
+	  for r2h in $$list; do						\
+	    if ($$r2h --version) >/dev/null 2>&1; then break 2;		\
+	    else :; fi;							\
+	  done;								\
+	  echo "cannot find rst2html, cannot create $@" >&2;		\
 	  exit 2;							\
-	fi;								\
-	$$R2H $< >$@.tmp
-	@mv $@.tmp $@
+	done;								\
+	$$r2h $< >$@-t && mv -f $@-t $@
 
 # Be sure to run check first, and then to convert the result.
 # Beware of concurrent executions.  Run "check" not "check-TESTS", as