comparison configure.ac @ 4118:9aa33376bb5e

[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
comparison
equal deleted inserted replaced
4117:229bd619740a 4118:9aa33376bb5e
1093 1093
1094 XE_EXPAND_VARIABLE(mandir,mandir_expanded) 1094 XE_EXPAND_VARIABLE(mandir,mandir_expanded)
1095 1095
1096 if test "x$mandir_expanded" = "x$prefix_expanded/man" 1096 if test "x$mandir_expanded" = "x$prefix_expanded/man"
1097 then 1097 then
1098 mandir='${prefix}/man/man1' 1098 mandir='${datarootdir}/man/man1'
1099 fi 1099 fi
1100 1100
1101 XE_EXPAND_VARIABLE(infodir,infodir_expanded) 1101 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
1102 1102
1103 if test "x$infodir_expanded" != "x${prefix_expanded}/info" 1103 if test "x$infodir_expanded" != "x${prefix_expanded}/info"
1104 then 1104 then
1105 AC_DEFINE(INFODIR_USER_DEFINED) 1105 AC_DEFINE(INFODIR_USER_DEFINED)
1106 else 1106 else
1107 infodir='${datadir}/${instvardir}/info' 1107 infodir='${datarootdir}/${instvardir}/info'
1108 fi 1108 fi
1109 1109
1110 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp' 1110 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp'
1111 inststaticdir='${PROGNAME}' 1111 inststaticdir='${PROGNAME}'
1112 instvardir='${PROGNAME}-${version}' 1112 instvardir='${PROGNAME}-${version}'
5702 AC_SUBST(verbose_version) 5702 AC_SUBST(verbose_version)
5703 AC_SUBST(inststaticdir) 5703 AC_SUBST(inststaticdir)
5704 AC_SUBST(instvardir) 5704 AC_SUBST(instvardir)
5705 AC_SUBST(srcdir) 5705 AC_SUBST(srcdir)
5706 AC_SUBST(bindir) 5706 AC_SUBST(bindir)
5707 dnl Shut up spurious warnings from autoconf 5707 AC_SUBST(datarootdir)
5708 AC_DEFUN([AC_DATAROOTDIR_CHECKED])
5709 AC_SUBST(datadir) 5708 AC_SUBST(datadir)
5710 AC_SUBST(statedir) 5709 AC_SUBST(statedir)
5711 AC_SUBST(libdir) 5710 AC_SUBST(libdir)
5712 AC_SUBST(mandir) 5711 AC_SUBST(mandir)
5713 AC_SUBST(extra_includes) 5712 AC_SUBST(extra_includes)