diff options
author | Kevin Ryde <user42@zip.com.au> | 2004-04-20 01:19:25 +0200 |
---|---|---|
committer | Kevin Ryde <user42@zip.com.au> | 2004-04-20 01:19:25 +0200 |
commit | 64a847f7445829533c8ffb70f11f8e332c698372 (patch) | |
tree | bb757622cf02360306ce6e521c418db56eb79d41 /install-sh | |
parent | 2ba3a1dbc9c881b59dc33af1a86819507b812eb9 (diff) | |
download | gmp-64a847f7445829533c8ffb70f11f8e332c698372.tar.gz |
* */Makefile.in, install-sh: Update to automake 1.8.3.
Diffstat (limited to 'install-sh')
-rwxr-xr-x | install-sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/install-sh b/install-sh index 040ebc886..77bc38144 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-01-12.10 +scriptversion=2004-02-15.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -214,7 +214,7 @@ do # Skip lots of stat calls in the usual case. if test ! -d "$dstdir"; then defaultIFS=' - ' + ' IFS="${IFS-$defaultIFS}" oIFS=$IFS @@ -228,7 +228,13 @@ do while test $# -ne 0 ; do pathcomp=$pathcomp$1 shift - test -d "$pathcomp" || $mkdirprog "$pathcomp" + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" || lasterr=$? + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } + fi pathcomp=$pathcomp/ done fi @@ -284,8 +290,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 : |