update from automake

diff --git a/config/ChangeLog b/config/ChangeLog
index cd7b7f1c7504989d2cab0ae405c154e369e2ca32..ee5f1a62f658cbf677822c86bbdd9cb8b45ed129 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-13  Karl Berry  <karl@gnu.org>
+
+       * install-sh: update from automake.
+
 2004-01-09  Karl Berry  <karl@gnu.org>
 
        * install-sh: update from automake.

diff --git a/config/install-sh b/config/install-sh
index acf44a6e0318c270090647e2a7f24575896ddff1..040ebc8866dfbc0acfcc2e25776c7c86a793459e 100755 (executable)
--- a/config/install-sh
+++ b/config/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;;