3 files changed, 12 insertions, 8 deletions

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  <miles@gnu.org>
+
+        * 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  <jasonr@gnu.org>
 
         * nt/makedist.bat: Do not rely on non-standard behaviour of
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index e4d0795cc67..ca6f2d94724 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -37,9 +37,6 @@ invalid pointer from string_free_list.
 
 ** Fix up url-ldap.el.
 
-** url/*.el has lots of `(declare (special ...))' which
-are meaningless.  What's that trying to do?
-
 * BUGS
 
 ** Ange-ftp should ignore irrelevant IPv6 errors:
@@ -242,7 +239,7 @@ lispref/commands.texi    "Luc Teirlinck"   Chong Yidong
 lispref/compile.texi     "Luc Teirlinck"   Chong Yidong
 lispref/control.texi     "Luc Teirlinck"   Chong Yidong
 lispref/customize.texi
-lispref/debugging.texi   Joakim Verona <joakim@verona.se>
+lispref/debugging.texi   Joakim Verona <joakim@verona.se>   Lute Kamstra
 lispref/display.texi
 lispref/edebug.texi
 lispref/elisp.texi       "Luc Teirlinck"
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
 }