# HG changeset patch # User Karl Berry # Date 1064666827 0 # Node ID 0c61e7103dcb2b21de5ef48ad87316c43a2e0179 # Parent a34045e45725f4e26a6d64e87ff5532acdbf2e3e update from automake diff --git a/config/ChangeLog b/config/ChangeLog --- 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 --- 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 @@ 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