From cf298164fe7a0793460f98ef97e6b4e529c4d247 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 5 Apr 2006 08:01:04 +0000 Subject: [PATCH] * lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR): Use simplified args that Eric Blake originally suggested. --- ChangeLog | 5 +++++ lib/m4sugar/m4sh.m4 | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 699b53d6..b27a1f98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-05 Paul Eggert + + * lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR): + Use simplified args that Eric Blake originally suggested. + 2006-04-04 Paul Eggert * 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 f0ca5934..fec0089d 100644 --- 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 |