Don't let the 'mostlyclean' target fail because of a nonempty directory.

diff --git a/ChangeLog b/ChangeLog
index 8055b38a891e925e7bf64657d2529577198394dc..fa6defb9ae5deba59e4187cc3f669a4f91d2296c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-23  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):
+       Don't let the 'mostlyclean' target fail if the last subdirectory could
+       not be removed.
+       Reported by Karl Berry.
+
 2007-06-23  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (echo): Add a speedier workaround for ksh.

diff --git a/gnulib-tool b/gnulib-tool
index 15b93d58c43eba718984152b4ae5cf2d8a2cebce..988bd921da9020da758e3afa5a82780f5e38a970 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-06-23 12:37:29 $'
+cvsdatestamp='$Date: 2007-06-23 19:21:30 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -1500,7 +1500,8 @@ func_emit_lib_Makefile_am ()
   echo "         if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
   echo "           echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
   echo "         fi; \\"
-  echo "       done"
+  echo "       done; \\"
+  echo "       :"
   rm -f allsnippets.tmp
 }
 
@@ -1615,7 +1616,8 @@ func_emit_tests_Makefile_am ()
   echo "         if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
   echo "           echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
   echo "         fi; \\"
-  echo "       done"
+  echo "       done; \\"
+  echo "       :"
   rm -f allsnippets.tmp
 }