From a9287c03f61b410af97e5fc4fbf299a02cdb9b90 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 Oct 2006 11:25:20 +0000 Subject: [PATCH] Avoid syntax error from bash 2.00 ... 2.05. --- ChangeLog | 6 ++++++ gnulib-tool | 24 +++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 190b68a3c4..21adf8a02b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-21 Bruno Haible + + * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): + Change mostlyclean-local rule to avoid sh syntax error from bash + versions 2.00..2.05 when $(MOSTLYCLEANDIRS) is empty. + 2006-10-23 Jim Meyering * lib/getaddrinfo.c (getnameinfo): Use new lightweight uinttostr, diff --git a/gnulib-tool b/gnulib-tool index a705f23a6a..83d6528d44 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-10-20 13:42:39 $' +cvsdatestamp='$Date: 2006-10-23 11:25:20 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -1214,12 +1214,11 @@ func_emit_lib_Makefile_am () cat allsnippets.tmp echo echo "mostlyclean-local: mostlyclean-generic" - echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" - echo " for dir in \$(MOSTLYCLEANDIRS); do \\" - echo " if test -d \$\$dir; then \\" - echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" - echo " fi; \\" - echo " done" + echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\" + echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" + echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" + echo " fi; \\" + echo " done" rm -f allsnippets.tmp } @@ -1317,12 +1316,11 @@ func_emit_tests_Makefile_am () echo " rm -rf SunWS_cache" echo echo "mostlyclean-local: mostlyclean-generic" - echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" - echo " for dir in \$(MOSTLYCLEANDIRS); do \\" - echo " if test -d \$\$dir; then \\" - echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" - echo " fi; \\" - echo " done" + echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\" + echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" + echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" + echo " fi; \\" + echo " done" rm -f allsnippets.tmp } -- 2.30.2