From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 26 Sep 2003 17:28:52 +0000 (+0000)
Subject: * lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
X-Git-Tag: Release-1-7b~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=315cadc1c6afdf411750feeb8e7cb74656064824;p=thirdparty%2Fautomake.git

* lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
Suggested by Eric Sunshine.
---

diff --git a/ChangeLog b/ChangeLog
index 5758b0a2a..0fdcf2aed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-26  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
+	Suggested by Eric Sunshine.
+
 2003-09-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* README: More mailing lists.
diff --git a/THANKS b/THANKS
index a87f92521..98c2a91ef 100644
--- a/THANKS
+++ b/THANKS
@@ -56,6 +56,7 @@ Enrico Scholz		enrico.scholz@informatik.tu-chemnitz.de
 Erez Zadok		ezk@cs.columbia.edu
 Eric Magnien		emagnien@club-internet.fr
 Eric Siegerman		erics_97@pobox.com
+Eric Sunshine		sunshine@sunshineco.com
 Erick Branderhorst	branderh@iaehv.nl
 Erik Lindahl		E.Lindahl@chem.rug.nl
 Ezra Peisach		epeisach@MED-XTAL.BU.EDU
diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index 8065dadd9..a55cff670 100755
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain.
 
-scriptversion=2003-06-14.23
+scriptversion=2003-09-26.19
 
 errstatus=0
 dirmode=""
@@ -65,12 +65,25 @@ case $dirmode in
     if mkdir -p -- . 2>/dev/null; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./-- && rmdir ./--
     fi
     ;;
   *)
     if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./-- "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac