Mercurial > hg > xemacs-beta

diff configure.ac @ 4118:9aa33376bb5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-08-15 12:28:06 by michaels] 2007-08-12 Mike Sperber <mike@xemacs.org> * Makefile.in.in (datarootdir): Add. * configure.ac (infodir): Now in terms of $(datarootdir). (mandir): Ditto, making it usually point to $(prefix)/share/man, conformant with the GNU Coding Standards. lib-src: 2007-08-12 Mike Sperber <mike@xemacs.org> * Makefile.in.in (datarootdir): Add. netinstall: 2007-08-12 Mike Sperber <mike@xemacs.org> * Makefile.in.in (datarootdir): Add.
author michaels
date Wed, 15 Aug 2007 12:28:45 +0000
parents 9c0151d05116
children 80b3f12490a3
line wrap: on
line diff
--- a/configure.ac	Wed Aug 15 11:06:10 2007 +0000
+++ b/configure.ac	Wed Aug 15 12:28:45 2007 +0000
@@ -1095,7 +1095,7 @@
 
 if test "x$mandir_expanded" = "x$prefix_expanded/man"
 then
-  mandir='${prefix}/man/man1'
+  mandir='${datarootdir}/man/man1'
 fi
 
 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
@@ -1104,7 +1104,7 @@
 then
   AC_DEFINE(INFODIR_USER_DEFINED)
 else
-  infodir='${datadir}/${instvardir}/info'
+  infodir='${datarootdir}/${instvardir}/info'
 fi
 
 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp'
@@ -5704,8 +5704,7 @@
 AC_SUBST(instvardir)
 AC_SUBST(srcdir)
 AC_SUBST(bindir)
-dnl Shut up spurious warnings from autoconf
-AC_DEFUN([AC_DATAROOTDIR_CHECKED])
+AC_SUBST(datarootdir)
 AC_SUBST(datadir)
 AC_SUBST(statedir)
 AC_SUBST(libdir)