diff --git a/admin/ChangeLog b/admin/ChangeLog index dbc48dfa696..efcd9b2d5e5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2005-03-02 Miles Bader + + * quick-install-emacs: Only use the mkdir --verbose option if the + script's --verbose option was specified (this avoids problems with + default usage on systems where mkdir doesn't support that option). + 2005-02-15 Jason Rumney * nt/makedist.bat: Do not rely on non-standard behaviour of diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 16cd936a783..9a9d1203d96 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -19,15 +19,16 @@ VERBOSE='' me="`basename $0`" -# Install commands (these commands are also expected to understand the -# GNU -v (--verbose) option) +# Install commands (if the user specifies the `--verbose' option, it is +# passed to these commands, so that feature only works if these commands +# implement it too) LINK='cp -lf' COPY='cp -f' REMOVE='rm -r' +MKDIR='mkdir -p' # Used to execute commands once once we create them EXEC='sh' -MKDIR='mkdir --verbose -p' NAWK=/usr/bin/nawk @@ -157,7 +158,7 @@ DST_INFO="$prefix/info" maybe_mkdir () { if ! test -d "$1"; then - $MKDIR "$1" 2>&1 | sed "s/^mkdir:/$me:/" 1>&2 + $MKDIR $VERBOSE "$1" 2>&1 | sed "s/^mkdir:/$me:/" 1>&2 fi }