# HG changeset patch # User Karl Berry # Date 1074087687 0 # Node ID c041966a4857f232f02f91b865ed659d9f1650dc # Parent 5331b5c2ca2ad8fa52a09743df4bd0bb95b889bd update from automake diff --git a/config/ChangeLog b/config/ChangeLog --- 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 --- 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 @@ # Skip lots of stat calls in the usual case. if test ! -d "$dstdir"; then defaultIFS=' - ' + ' IFS="${IFS-$defaultIFS}" oIFS=$IFS @@ -284,8 +284,8 @@ $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 :