* lib/install-sh: Simplify the expr implementation of dirname.

diff --git a/ChangeLog b/ChangeLog
index 35bbdcc4c1430f97c1d7104a939c75e6edb4fda9..af226cbe1354438306afc256cb7b3c4e046dbb50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-25  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/install-sh: Simplify the expr implementation of dirname.
+
 2006-04-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/install.sh: Handle --, and diagnose unknown options.

diff --git a/lib/install-sh b/lib/install-sh
index 11850a9a9a3b02a50616b1a19ceb65b11a53a6ab..220d6647ef262e41f73c56da9257134345ea1758 100755 (executable)
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-04-24.12
+scriptversion=2006-04-25.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -238,8 +238,7 @@ do
        expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
             X"$dst" : 'X\(//\)[^/]' \| \
             X"$dst" : 'X\(//\)$' \| \
-            X"$dst" : 'X\(/\)' \| \
-            .       : '\(.\)' 2>/dev/null ||
+            X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
        echo X"$dst" |
            sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
                   s//\1/