diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-02-14 23:08:59 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-02-14 23:08:59 +0000 |
| commit | 05e61daca4d7e0ed1f82e0e604812b90b8bcbde1 (patch) | |
| tree | dfa8745d2ae39bfabc619e50d16f565a10fe16f8 /build-aux | |
| parent | 83dcf2436fec5440943c03dac404f4b25f72e222 (diff) | |
| download | coreutils-05e61daca4d7e0ed1f82e0e604812b90b8bcbde1.tar.xz | |
Sync from gnulib.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/ChangeLog | 4 | ||||
| -rwxr-xr-x | build-aux/install-sh | 24 |
2 files changed, 22 insertions, 6 deletions
diff --git a/build-aux/ChangeLog b/build-aux/ChangeLog index 302d7aee7..774b2781c 100644 --- a/build-aux/ChangeLog +++ b/build-aux/ChangeLog @@ -1,3 +1,7 @@ +2006-02-14 Paul Eggert <eggert@cs.ucla.edu> + + * install-sh: Update from gnulib. + 2006-01-31 Jim Meyering <jim@meyering.net> * config.guess, missing, texinfo.tex: Update from gnulib. diff --git a/build-aux/install-sh b/build-aux/install-sh index 0ae12c0eb..fd2e75a02 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-11-07.23 +scriptversion=2006-01-12.21 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -233,11 +233,23 @@ do X"$dst" : 'X\(/\)' \| \ . : '\(.\)' 2>/dev/null || echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q' + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' ` test -d "$dstdir" |