I'm installing this on HEAD.

2005-02-27  Alexandre Duret-Lutz  <[EMAIL PROTECTED]>

        * m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.
        * doc/automake.texi (Hard-Coded Install Paths): Adjust.

Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.103
diff -u -r1.103 automake.texi
--- doc/automake.texi   27 Feb 2005 00:09:03 -0000      1.103
+++ doc/automake.texi   27 Feb 2005 00:22:38 -0000
@@ -9113,7 +9113,7 @@
         s,.*/lib/\(x*emacs/site-lisp\)$,[EMAIL PROTECTED]@}/\1,;p;q;
       @}'
   -e '/.*\/share\/x*emacs\/site-lisp$/@{
-        s,.*/share/\(x*emacs/site-lisp\),[EMAIL PROTECTED]@}/\1,;p;q;
+        s,.*/share/\(x*emacs/site-lisp\),[EMAIL PROTECTED]@}/\1,;p;q;
       @}'
   conftest.out`
 @end example
Index: m4/lispdir.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lispdir.m4,v
retrieving revision 1.26
diff -u -r1.26 lispdir.m4
--- m4/lispdir.m4       9 Jan 2005 14:46:21 -0000       1.26
+++ m4/lispdir.m4       27 Feb 2005 00:22:38 -0000
@@ -39,7 +39,7 @@
        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

-- 
Alexandre Duret-Lutz



Reply via email to