* m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.

* doc/automake.texi (Hard-Coded Install Paths): Adjust.

diff --git a/ChangeLog b/ChangeLog
index a119e646751d919d297140f223e341f8815da0ec..1851b88dc13b907552412d92dd45ddaf485fb6af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-27  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.
+       * doc/automake.texi (Hard-Coded Install Paths): Adjust.
+
        * doc/automake.texi: Replace many uses of @samp by @code, and
        vice versa.  Use @command, @option, and @env where appropriate.
 

diff --git a/doc/automake.texi b/doc/automake.texi
index 0f78c2d4c3b51353823064c37e68e1d69e1f83a8..741f93694c9b3eca5ce711b05f9ad0c7dc1dbe90 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -9113,7 +9113,7 @@ lispdir=`sed -n
         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;
+        s,.*/share/\(x*emacs/site-lisp\),$@{datarootdir@}/\1,;p;q;
       @}'
   conftest.out`
 @end example

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index b977c52835db638224bf2ebb4559f959f86a68c6..29c4e0d85873b0f9e754c97142da3c5d76425a0a 100644 (file)
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -39,7 +39,7 @@ AC_DEFUN([AM_PATH_LISPDIR],
        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 '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datarootdir}/\1,;p;q;}' \
        conftest.out`
        rm conftest.out
      fi