aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorMiles Bader2005-03-02 09:26:43 +0000
committerMiles Bader2005-03-02 09:26:43 +0000
commit9a1c5fbf826728451ecb318c0788ab1f15ef0b02 (patch)
tree43a7f9f7c1ded8e5b7454b0dc441509eeb1a8210 /admin
parentaad1926a4f348185f2dbdb6ffd1ba86f3d80710c (diff)
downloademacs-9a1c5fbf826728451ecb318c0788ab1f15ef0b02.tar.gz
emacs-9a1c5fbf826728451ecb318c0788ab1f15ef0b02.zip
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-146
quick-install-emacs: Use mkdir --verbose only when requested 2005-03-02 Miles Bader <miles@gnu.org> * admin/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).
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog6
-rwxr-xr-xadmin/quick-install-emacs9
2 files changed, 11 insertions, 4 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index dbc48dfa696..efcd9b2d5e5 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
12005-03-02 Miles Bader <miles@gnu.org>
2
3 * quick-install-emacs: Only use the mkdir --verbose option if the
4 script's --verbose option was specified (this avoids problems with
5 default usage on systems where mkdir doesn't support that option).
6
12005-02-15 Jason Rumney <jasonr@gnu.org> 72005-02-15 Jason Rumney <jasonr@gnu.org>
2 8
3 * nt/makedist.bat: Do not rely on non-standard behaviour of 9 * 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=''
19 19
20me="`basename $0`" 20me="`basename $0`"
21 21
22# Install commands (these commands are also expected to understand the 22# Install commands (if the user specifies the `--verbose' option, it is
23# GNU -v (--verbose) option) 23# passed to these commands, so that feature only works if these commands
24# implement it too)
24LINK='cp -lf' 25LINK='cp -lf'
25COPY='cp -f' 26COPY='cp -f'
26REMOVE='rm -r' 27REMOVE='rm -r'
28MKDIR='mkdir -p'
27 29
28# Used to execute commands once once we create them 30# Used to execute commands once once we create them
29EXEC='sh' 31EXEC='sh'
30MKDIR='mkdir --verbose -p'
31 32
32NAWK=/usr/bin/nawk 33NAWK=/usr/bin/nawk
33 34
@@ -157,7 +158,7 @@ DST_INFO="$prefix/info"
157maybe_mkdir () 158maybe_mkdir ()
158{ 159{
159 if ! test -d "$1"; then 160 if ! test -d "$1"; then
160 $MKDIR "$1" 2>&1 | sed "s/^mkdir:/$me:/" 1>&2 161 $MKDIR $VERBOSE "$1" 2>&1 | sed "s/^mkdir:/$me:/" 1>&2
161 fi 162 fi
162} 163}
163 164