Skip to content

Commit

Permalink
2004-11-15 Kelley Cook <kcook@gcc.gnu.org>
Browse files Browse the repository at this point in the history
	* install-sh, compile: Import from automake.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90710 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
kcook committed Nov 16, 2004
1 parent e294bcf commit 037ff4c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
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.
Expand Down
4 changes: 3 additions & 1 deletion compile
Original file line number Diff line number Diff line change
@@ -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>.
Expand Down Expand Up @@ -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"
Expand Down
7 changes: 4 additions & 3 deletions install-sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.

Expand All @@ -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=
Expand Down

0 comments on commit 037ff4c

Please sign in to comment.