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

Use simplified args that Eric Blake originally suggested.
This commit is contained in:
Paul Eggert 2006-04-05 08:01:04 +00:00
parent 39572957c6
commit cf298164fe
2 changed files with 7 additions and 4 deletions

View File

@ -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.

View File

@ -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 |