Mercurial > hg > xemacs-beta

comparison configure.ac @ 4092:9c0151d05116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-08-02 06:33:04 by michaels] 2007-07-31 Mike Sperber <mike@xemacs.org> * configure.ac: Don't divert `share' to `lib' for datadir. Also, define AC_DATAROOTDIR_CHECKED to shut up autoconf. 2007-07-31 Mike Sperber <mike@xemacs.org> * find-paths.el (paths-for-each-site-directory): (paths-find-site-directory): (paths-find-site-directories): (paths-for-each-version-directory): (paths-find-version-directory): (paths-find-version-directories): Add `arch-dependent-p' argument to distinguish between `lib' and `share'. (paths-find-architecture-directory): Follow above change. * packages.el (packages-find-installation-package-directories): Ditto. * setup-paths.el (paths-find-site-lisp-directory): (paths-find-site-module-directory): (paths-find-lisp-directory): (paths-find-mule-lisp-directory): (paths-find-module-directory): (paths-find-data-directory): Ditto.
author michaels
date Thu, 02 Aug 2007 06:33:59 +0000
parents 6cd3955b7e4d
children 9aa33376bb5e
comparison
equal deleted inserted replaced
4091:7b78a0e97947 4092:9c0151d05116
1071 1071
1072 if test "x$datadir_expanded" != "x$prefix_expanded/share" 1072 if test "x$datadir_expanded" != "x$prefix_expanded/share"
1073 then 1073 then
1074 AC_DEFINE(INFODIR_USER_DEFINED) 1074 AC_DEFINE(INFODIR_USER_DEFINED)
1075 AC_DEFINE(LISPDIR_USER_DEFINED) 1075 AC_DEFINE(LISPDIR_USER_DEFINED)
1076 AC_DEFINE(ETCDIR_USER_DEFINED)
1077 fi
1078
1079 if test "x$lib_expanded" != "x$prefix_expanded/lib"
1080 then
1076 AC_DEFINE(MODULEDIR_USER_DEFINED) 1081 AC_DEFINE(MODULEDIR_USER_DEFINED)
1077 AC_DEFINE(ETCDIR_USER_DEFINED) 1082 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1078 AC_DEFINE(DOCDIR_USER_DEFINED) 1083 AC_DEFINE(DOCDIR_USER_DEFINED)
1079 AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
1080 else
1081 datadir='${prefix}/lib'
1082 fi 1084 fi
1083 1085
1084 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded) 1086 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
1085 XE_EXPAND_VARIABLE(libdir,libdir_expanded) 1087 XE_EXPAND_VARIABLE(libdir,libdir_expanded)
1086 1088
5700 AC_SUBST(verbose_version) 5702 AC_SUBST(verbose_version)
5701 AC_SUBST(inststaticdir) 5703 AC_SUBST(inststaticdir)
5702 AC_SUBST(instvardir) 5704 AC_SUBST(instvardir)
5703 AC_SUBST(srcdir) 5705 AC_SUBST(srcdir)
5704 AC_SUBST(bindir) 5706 AC_SUBST(bindir)
5707 dnl Shut up spurious warnings from autoconf
5708 AC_DEFUN([AC_DATAROOTDIR_CHECKED])
5705 AC_SUBST(datadir) 5709 AC_SUBST(datadir)
5706 AC_SUBST(statedir) 5710 AC_SUBST(statedir)
5707 AC_SUBST(libdir) 5711 AC_SUBST(libdir)
5708 AC_SUBST(mandir) 5712 AC_SUBST(mandir)
5709 AC_SUBST(extra_includes) 5713 AC_SUBST(extra_includes)