[Emacs-diffs] /srv/bzr/emacs/trunk r103285: * install-sh: Update to scriptversion 2011-01-19.21.

[Paul Eggert]

------------------------------------------------------------
revno: 103285
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-15 16:19:57 -0800
message:
  * install-sh: Update to scriptversion 2011-01-19.21.
modified:
  ChangeLog
  install-sh

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-15 04:53:29 +0000
+++ b/ChangeLog 2011-02-16 00:19:57 +0000
@@ -2,6 +2,8 @@
 
        Merge from gnulib.
 
+       * install-sh: Update to scriptversion 2011-01-19.21.
+
        2011-02-13  Bruno Haible  <address@hidden>
 
        Consistent macro naming for macros that use GCC __attribute__.

=== modified file 'install-sh'
--- a/install-sh        2011-01-07 20:42:11 +0000
+++ b/install-sh        2011-02-16 00:19:57 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2010-02-06.18; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+       # Protect names problematic for `test' and other utilities.
+       case $dst_arg in
+         -* | [=\(\)!]) dst_arg=./$dst_arg;;
+       esac
        shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -232,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -256,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -389,7 +392,7 @@
 
       case $dstdir in
        /*) prefix='/';;
-       -*) prefix='./';;
+       [-=\(\)!]*) prefix='./';;
        *)  prefix='';;
       esac
 
@@ -407,7 +410,7 @@
 
       for d
       do
-       test -z "$d" && continue
+       test X"$d" = X && continue
 
        prefix=$prefix$d
        if test -d "$prefix"; then