From: Karl Berry Date: Wed, 14 Jan 2004 13:41:27 +0000 (+0000) Subject: update from automake X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9837a3d2155c654008d6aa133044bdd63f5462c3;p=pspp update from automake --- diff --git a/config/ChangeLog b/config/ChangeLog index ee5f1a62f6..18913a85c2 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2004-01-14 Karl Berry + + * install-sh: update from automake. + 2004-01-13 Karl Berry * install-sh: update from automake. diff --git a/config/install-sh b/config/install-sh index 040ebc8866..8042a49baf 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-12.10 +scriptversion=2004-01-13.14 # 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 @@ -284,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 :