* lib/install-sh: Do not use "$@" in a context where it may be empty,

for the sake of OSF1/Tru64's shell.
Report from He Li.

diff --git a/ChangeLog b/ChangeLog
index 300392089e457ba25c7b68a894736357b4a4cbbc..c0cc848e162ca23b72723922e7755d86cecc1336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-12  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/install-sh: Do not use "$@" in a context where it may be empty,
+       for the sake of OSF1/Tru64's shell.
+       Report from He Li.
+
 2004-01-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/config.sub, lib/config.guess, lib/texinfo.tex: New upstream

diff --git a/THANKS b/THANKS
index 9a954309b50281dd7e1f25607cca643aed52cc88..dc53270688f4cef05ea715a3da3ec6307a0202d7 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -82,6 +82,7 @@ Gwenole Beauchesne      gbeauchesne@mandrakesoft.com
 H.J. Lu                        hjl@lucon.org
 H.Merijn Brand         h.m.brand@hccnet.nl
 Harlan Stenn           Harlan.Stenn@pfcs.com
+He Li                          tippa000@yahoo.com
 Henrik Frystyk Nielsen frystyk@w3.org
 Ian Lance Taylor       ian@cygnus.com
 Imacat                 imacat@mail.imacat.idv.tw

diff --git a/lib/install-sh b/lib/install-sh
index acf44a6e0318c270090647e2a7f24575896ddff1..040ebc8866dfbc0acfcc2e25776c7c86a793459e 100755 (executable)
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-01-08.23
+scriptversion=2004-01-12.10
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -140,11 +140,12 @@ while test -n "$1"; do
         # Otherwise, the last argument is the destination.  Remove it from $@.
        for arg
        do
-         shift
           if test -n "$dstarg"; then
+           # $@ is not empty: it contains at least $arg.
            set fnord "$@" "$dstarg"
-           shift
+           shift # fnord
          fi
+         shift # arg
          dstarg=$arg
        done
        break;;