Will commit Tuesday if nobody objects.
ChangeLog:
2007-08-12 Mike Sperber <mike(a)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/ChangeLog:
2007-08-12 Mike Sperber <mike(a)xemacs.org>
* Makefile.in.in (datarootdir): Add.
netinstall/ChangeLog:
2007-08-12 Mike Sperber <mike(a)xemacs.org>
* Makefile.in.in (datarootdir): Add.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.31
diff -u -r1.31 Makefile.in.in
--- Makefile.in.in 19 Dec 2006 15:24:13 -0000 1.31
+++ Makefile.in.in 12 Aug 2007 13:34:32 -0000
@@ -116,6 +116,10 @@
## run directly (like etags).
bindir=@bindir@
+## Base for installing architecture-independent data files.
+## ${infodir} and ${mandir} are subdirectories of this.
+datarootdir=@datarootdir@
+
## Where to install architecture-independent data files.
## ${lispdir} and ${etcdir} are subdirectories of this.
datadir=@datadir@
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.60
diff -u -r1.60 configure.ac
--- configure.ac 2 Aug 2007 06:33:17 -0000 1.60
+++ configure.ac 12 Aug 2007 13:34:33 -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)
Index: lib-src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v
retrieving revision 1.50
diff -u -r1.50 Makefile.in.in
--- lib-src/Makefile.in.in 21 May 2007 03:50:19 -0000 1.50
+++ lib-src/Makefile.in.in 12 Aug 2007 13:34:33 -0000
@@ -56,6 +56,7 @@
libdir=@libdir@
srcdir=@srcdir@
datadir=@datadir@
+datarootdir=@datarootdir@
instvardir=@instvardir@
top_srcdir=@top_srcdir@
archlibdir=@archlibdir@
Index: netinstall/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in.in
--- netinstall/Makefile.in.in 22 Nov 2005 07:14:39 -0000 1.7
+++ netinstall/Makefile.in.in 12 Aug 2007 13:34:33 -0000
@@ -55,6 +55,7 @@
bindir=@bindir@
libdir=@libdir@
srcdir=@srcdir@
+datarootdir=@datarootdir@
datadir=@datadir@
instvardir=@instvardir@
top_srcdir=@top_srcdir@
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches