Mercurial > gnulib

changeset 9010:03602a916a9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't let the 'mostlyclean' target fail because of a nonempty directory.
author Bruno Haible <bruno@clisp.org>
date Sat, 23 Jun 2007 19:21:30 +0000
parents 749a1b6b111d
children 0589063a61f3
files ChangeLog gnulib-tool
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jun 23 12:37:29 2007 +0000
+++ b/ChangeLog	Sat Jun 23 19:21:30 2007 +0000
@@ -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.
--- a/gnulib-tool	Sat Jun 23 12:37:29 2007 +0000
+++ b/gnulib-tool	Sat Jun 23 19:21:30 2007 +0000
@@ -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 @@
   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 @@
   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
 }