From febefa72f8ece0be843be1d9d45b2b1c5fba39bf Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 10 Jan 2004 14:11:07 +0000 Subject: [PATCH] * m4/lispdir.m4 (AM_PATH_LISPDIR): Don't use ? in sed regular expressions; it doesn't conform to POSIX. --- ChangeLog | 5 +++++ m4/lispdir.m4 | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffd0ae1..2993024 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-10 Paul Eggert + + * m4/lispdir.m4 (AM_PATH_LISPDIR): Don't use \? in sed regular + expressions; it doesn't conform to POSIX. + 2004-01-10 Alexandre Duret-Lutz * automake.in (shadow_unconditionally): New function... diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index 062b49e..0986584 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -4,7 +4,7 @@ ## Almost entirely rewritten by Alexandre Oliva ## ------------------------ -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -22,7 +22,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 7 +# serial 8 # AM_PATH_LISPDIR # --------------- @@ -50,8 +50,8 @@ AC_DEFUN([AM_PATH_LISPDIR], AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' conftest.out]) am_cv_lispdir=`sed -n \ -e 's,/$,,' \ - -e '/.*\/lib\/x\?emacs\/site-lisp$/{s,.*/lib/\(x\?emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ - -e '/.*\/share\/x\?emacs\/site-lisp$/{s,.*/share/\(x\?emacs/site-lisp\),${datadir}/\1,;p;q;}' \ + -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ + -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datadir}/\1,;p;q;}' \ conftest.out` rm conftest.out fi -- 2.7.4