From f54e3e730aeea7226384d29ffe4310187048cd9a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 23 Jun 2007 19:21:30 +0000 Subject: [PATCH] Don't let the 'mostlyclean' target fail because of a nonempty directory. --- ChangeLog | 7 +++++++ gnulib-tool | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8055b38a89..fa6defb9ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-23 Bruno Haible + + * 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 * gnulib-tool (echo): Add a speedier workaround for ksh. diff --git a/gnulib-tool b/gnulib-tool index 15b93d58c4..988bd921da 100755 --- 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 } -- 2.30.2