From 1f8e706945ad90fa261c07a3219623a022b44c20 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Sep 2003 12:47:07 +0000 Subject: [PATCH] update from automake --- config/ChangeLog | 4 ++++ config/mkinstalldirs | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config/ChangeLog b/config/ChangeLog index 744a27c6f5..7aee0a706a 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2003-09-27 Karl Berry + + * mkinstalldirs: update from automake. + 2003-09-25 Karl Berry * install-sh: update from automake. diff --git a/config/mkinstalldirs b/config/mkinstalldirs index 8065dadd90..a55cff6706 100644 --- a/config/mkinstalldirs +++ b/config/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 -- 2.30.2