Be tolerant if rm was not able to remove the test directory.

diff --git a/ChangeLog b/ChangeLog
index 876f7a86cb83641d621d58002397fc5d838b7f4c..852b63508976b531c53e94d8cf2e227e4146bc0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01  Eric Blake  <ebb9@byu.net>
+
+       * lib/m4sugar/m4sh.m4 (AS_MKDIR_P): Allow use in shell lists.
+       * lib/autotest/general.m4: Be tolerant of existing directory when
+         rm failed to remove it.
+
 2006-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * bin/autoupdate.in: Redefine m4_location so that warnings print

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 1eb12d3c0f60585ca71c67e22962ed2190612afb..e8a43ae92317bef9062fc0f7833f1ffc486ce07d 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -699,7 +699,8 @@ do
        find $at_group_dir -type d ! -perm -700 -exec chmod u+rwx \{\} \;
        rm -fr $at_group_dir
       fi
-      mkdir $at_group_dir ||
+      # Be tolerant if the above `rm' was not able to remove the directory.
+      AS_MKDIR_P([$at_group_dir]) ||
        AS_ERROR([cannot create $at_group_dir])
       cd $at_group_dir
       ;;

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index e022622cca0d55a85ecefed27506ea7a3908848b..30c9bab07b29e399610f4210c38abd42aca75376 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -940,7 +940,7 @@ m4_define([AS_MKDIR_P],
       as_dir=`AS_DIRNAME("$as_dir")`
     done
     test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || AS_ERROR([cannot create directory $1]); }
+  fi || AS_ERROR([cannot create directory $1]); }dnl
 ])# AS_MKDIR_P