2003-06-15 Jens Elkner <elkner@imsgroup.de> (tiny change)

        * m4/lispdir.m4 (AM_PATH_LISPDIR): Fix sed commands to work with
        POSIXLY_CORRECT=1.

diff --git a/ChangeLog b/ChangeLog
index bc20e14fa0cc612e7bc1ae9369b6d0c14f321b84..d60acbe954ca811ec36184a75f87ac71202837b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-15  Jens Elkner  <elkner@imsgroup.de>  (tiny change)
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Fix sed commands to work with
+       POSIXLY_CORRECT=1.
+
 2003-06-14  Karl Berry  <karl@gnu.org>
            Alexandre Duret-Lutz  <adl@gnu.org>
 

diff --git a/THANKS b/THANKS
index 43987c2a1c3d093cb107206896b54fa1fe422073..90b2301f608b21d9b0ac7c84bf29bfebb802424d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -89,6 +89,7 @@ Jason Molenda         crash@cygnus.co.jp
 Jeff Bailey            Jbailey@phn.ca
 Jeff Garzik            jgarzik@pobox.com
 Jeff Squyres           jsquyres@lam-mpi.org
+Jens Elkner            elkner@imsgroup.de
 Jens Krüger            jens_krueger@physik.tu-muenchen.de
 Jeremy Nimmer          jwnimmer@alum.mit.edu
 Jerome Lovy            jlovy@multimania.com

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 170b7ee626333628b37379dcaa2218392c40e1a3..5ef871731a2aca7c9d4a1d72e93b63da51d7ee93 100644 (file)
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -22,7 +22,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 6
+# serial 7
 
 # 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)))' </dev/null >conftest.out])
        am_cv_lispdir=`sed -n \
        -e 's,/$,,' \
-       -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \
-       -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${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
        if test -z "$am_cv_lispdir"; then