aboutsummaryrefslogtreecommitdiff
path: root/scripts/install-sh
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-12-20 22:26:24 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-12-20 22:28:20 +0000
commit41d11b15a10ab049598ac053f75e9b59deafc537 (patch)
treefa07f5ead18aba6d0ea863824164169be0807674 /scripts/install-sh
parent8d2d239cb7db9df7b486d5f153c90865443e7abb (diff)
downloadglibc-41d11b15a10ab049598ac053f75e9b59deafc537.tar
glibc-41d11b15a10ab049598ac053f75e9b59deafc537.tar.gz
glibc-41d11b15a10ab049598ac053f75e9b59deafc537.tar.bz2
glibc-41d11b15a10ab049598ac053f75e9b59deafc537.zip
Update miscellaneous files from upstream sources.
This patch updates various miscellaneous files from their upstream sources. Tested for x86_64, including "make pdf". * manual/texinfo.tex: Update to version 2017-12-18.20 with trailing whitespace removed. * scripts/config.guess: Update to version 2017-12-17. * scripts/config.sub: Update to version 2017-11-23. * scripts/install-sh: Update to version 2017-09-23.17. * scripts/move-if-change: Update to version 2017-09-13 06:45.
Diffstat (limited to 'scripts/install-sh')
-rwxr-xr-xscripts/install-sh20
1 files changed, 14 insertions, 6 deletions
diff --git a/scripts/install-sh b/scripts/install-sh
index 0360b79e7d..ac159ceda4 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-23.17; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -427,8 +435,8 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0