diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | compile | 4 | ||||
| -rwxr-xr-x | install-sh | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index c7de93e40dd..35e6d98ad69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-11-15 Kelley Cook <kcook@gcc.gnu.org> + * install-sh, compile: Import from automake. + +2004-11-15 Kelley Cook <kcook@gcc.gnu.org> + * config.guess, config.sub: Import from savannnah. 2004-11-12 Scott Robert Ladd <scott.ladd@coyotegulch.com> @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2004-09-10.20 +scriptversion=2004-10-12.08 # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. @@ -125,6 +125,8 @@ ret=$? if test -f "$cofile"; then mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" diff --git a/install-sh b/install-sh index dd97db7aa1c..0b65ee871d3 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-09-10.20 +scriptversion=2004-10-22.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -213,7 +213,7 @@ do fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,7 +226,8 @@ do oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift IFS=$oIFS pathcomp= |