Mercurial > hg > xemacs-beta
comparison configure.ac @ 5149:b72f27a08ed5
Reflect --with-datadir setting in late-package directories.
2010-03-18 Mike Sperber <mike@xemacs.org>
* configure.ac: Set LATE_PACKAGE_DIRECTORIES_USER_DEFINED if
`datadir' was changed; set `with_late_packages' to something
sensible for this case.
author | Mike Sperber <sperber@deinprogramm.de> |
---|---|
date | Thu, 18 Mar 2010 13:42:29 +0100 |
parents | 6f2158fa75ed |
children | 5efbd1253905 |
comparison
equal
deleted
inserted
replaced
5148:9c4bf82eaac2 | 5149:b72f27a08ed5 |
---|---|
1106 if test "x$datadir" != "x\${datarootdir}" | 1106 if test "x$datadir" != "x\${datarootdir}" |
1107 then | 1107 then |
1108 AC_DEFINE(INFODIR_USER_DEFINED) | 1108 AC_DEFINE(INFODIR_USER_DEFINED) |
1109 AC_DEFINE(LISPDIR_USER_DEFINED) | 1109 AC_DEFINE(LISPDIR_USER_DEFINED) |
1110 AC_DEFINE(ETCDIR_USER_DEFINED) | 1110 AC_DEFINE(ETCDIR_USER_DEFINED) |
1111 AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED) | |
1111 fi | 1112 fi |
1112 | 1113 |
1113 if test "x$libdir" != "x\${exec_prefix}/lib" | 1114 if test "x$libdir" != "x\${exec_prefix}/lib" |
1114 then | 1115 then |
1115 AC_DEFINE(MODULEDIR_USER_DEFINED) | 1116 AC_DEFINE(MODULEDIR_USER_DEFINED) |
1126 | 1127 |
1127 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp' | 1128 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp' |
1128 inststaticdir='${PROGNAME}' | 1129 inststaticdir='${PROGNAME}' |
1129 instvardir='${PROGNAME}-${version}' | 1130 instvardir='${PROGNAME}-${version}' |
1130 sitemoduledir='${libdir}/${inststaticdir}/site-modules' | 1131 sitemoduledir='${libdir}/${inststaticdir}/site-modules' |
1132 with_late_packages='${datadir}/${PROGNAME}' | |
1131 | 1133 |
1132 AC_SUBST(inststaticdir) | 1134 AC_SUBST(inststaticdir) |
1133 AC_SUBST(statedir,$with_statedir) | 1135 AC_SUBST(statedir,$with_statedir) |
1134 | 1136 |
1135 dnl ------------------------------------------------------------------------- | 1137 dnl ------------------------------------------------------------------------- |