Avoid syntax error from bash 2.00 ... 2.05.

diff --git a/ChangeLog b/ChangeLog
index 190b68a3c46678e6cb0e3735ef0b67554e87455a..21adf8a02beb408c9b5466039e3be416803461af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-21  Bruno Haible  <bruno@clisp.org>
+
+       * 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  <jim@meyering.net>
 
        * lib/getaddrinfo.c (getnameinfo): Use new lightweight uinttostr,

diff --git a/gnulib-tool b/gnulib-tool
index a705f23a6a5a6d3acd30a6f0d02343d4378e225c..83d6528d445094231f450b963ea8a79d660f9fb5 100755 (executable)
--- 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
 }