* lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR):

Use simplified args that Eric Blake originally suggested.

diff --git a/ChangeLog b/ChangeLog
index 699b53d672d2d2561a716edfb0c66ab0e4f84553..b27a1f986ad1fefabf3c478234d8289da70e8690 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR):
+       Use simplified args that Eric Blake originally suggested.
+
 2006-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * tests/mktests.sh: Don't use 'cat'; just read the files directly.

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index f0ca5934b7b9d85c7e7fdc660bbacea3a64226ef..fec0089d23760646b8cd1cb41c878a3c9760d9ae 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -666,8 +666,7 @@ m4_defun([AS_BASENAME_EXPR],
 [AS_REQUIRE([_AS_EXPR_PREPARE])dnl
 $as_expr X/[]$1 : '.*/\([[^/][^/]*]\)/*$' \| \
         X[]$1 : 'X\(//\)$' \| \
-        X[]$1 : 'X\(/\)' \| \
-        .     : '\(.\)'])
+        X[]$1 : 'X\(/\)' \| .])
 
 m4_defun([AS_BASENAME_SED],
 [echo X/[]$1 |
@@ -720,8 +719,7 @@ m4_defun([AS_DIRNAME_EXPR],
 $as_expr X[]$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \
         X[]$1 : 'X\(//\)[[^/]]' \| \
         X[]$1 : 'X\(//\)$' \| \
-        X[]$1 : 'X\(/\)' \| \
-        .     : '\(.\)'])
+        X[]$1 : 'X\(/\)' \| .])
 
 m4_defun([AS_DIRNAME_SED],
 [echo X[]$1 |