(_AS_MKDIR_P_PREPARE): Change "rm -fr ./-p" to "test -d ./-p && rmdir ./-p".

diff --git a/ChangeLog b/ChangeLog
index 1b9cdae238ca4dda5fb737496259b39b1f25ae68..0a44b28326518d87d6a9efd58b6aa47695431781 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Set DUALCASE=1, for MKS sh.
        Problem reported by Lars J. Aas in
        <http://mail.gnu.org/archive/html/autoconf/2003-07/msg00042.html>.
+       (_AS_MKDIR_P_PREPARE): Change "rm -fr ./-p" to the more-conservative
+       "test -d ./-p && rmdir ./-p".  Suggested by Andreas Schwab in:
+       http://mail.gnu.org/archive/html/autoconf-patches/2003-09/msg00039.html
        
 2003-09-26  Akim Demaille  <akim@epita.fr>
 

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index a33ea36dca4d42aaa78f4acf7ee01cfc1d75d4e9..dce6b6f9ac717cf18193a70321c8495953f27ab3 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -691,7 +691,7 @@ m4_defun([_AS_MKDIR_P_PREPARE],
 [if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  rm -fr ./-p
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 ])# _AS_MKDIR_P_PREPARE