summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-01-13 12:27:45 +0000
committerJim Meyering <jim@meyering.net>2004-01-13 12:27:45 +0000
commit64fcce3bd9d3a73eaf71929b58f17d54f744c73d (patch)
treec75d7bb46c8b1cdd5f200b94187dbc5033d1d161 /config
parentf76b97901d4171e13702c432cd54795baae531ca (diff)
downloadcoreutils-64fcce3bd9d3a73eaf71929b58f17d54f744c73d.tar.xz
update from automake-1.8.2
Diffstat (limited to 'config')
-rwxr-xr-xconfig/install-sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/config/install-sh b/config/install-sh
index d5612e95f..040ebc886 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2004-01-08.23
+scriptversion=2004-01-12.10
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -140,11 +140,12 @@ while test -n "$1"; do
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- shift
if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
- shift
+ shift # fnord
fi
+ shift # arg
dstarg=$arg
done
break;;
@@ -213,7 +214,7 @@ do
# Skip lots of stat calls in the usual case.
if test ! -d "$dstdir"; then
defaultIFS='
- '
+ '
IFS="${IFS-$defaultIFS}"
oIFS=$IFS
@@ -283,8 +284,8 @@ do
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit
}
else
: