From 0d3ad21bf611564dfadc0e8a7de48b50ddf12ae7 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 27 Feb 2005 00:24:31 +0000 Subject: [PATCH] * m4/lispdir.m4: Use datarootdir instead of datadir to match GCS. * doc/automake.texi (Hard-Coded Install Paths): Adjust. --- ChangeLog | 3 +++ doc/automake.texi | 2 +- m4/lispdir.m4 | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a119e6467..1851b88dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-02-27 Alexandre Duret-Lutz + * 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 0f78c2d4c..741f93694 100644 --- 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 b977c5283..29c4e0d85 100644 --- 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 -- 2.47.2