[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.

--- a/configure.ac	Wed Aug 01 21:51:10 2007 +0000
+++ b/configure.ac	Thu Aug 02 06:33:59 2007 +0000
@@ -1073,12 +1073,14 @@
 then
   AC_DEFINE(INFODIR_USER_DEFINED)
   AC_DEFINE(LISPDIR_USER_DEFINED)
+  AC_DEFINE(ETCDIR_USER_DEFINED)
+fi
+
+if test "x$lib_expanded" != "x$prefix_expanded/lib"
+then
   AC_DEFINE(MODULEDIR_USER_DEFINED)
-  AC_DEFINE(ETCDIR_USER_DEFINED)
+  AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
   AC_DEFINE(DOCDIR_USER_DEFINED)
-  AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
-else
-  datadir='${prefix}/lib'
 fi
 
 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
@@ -5702,6 +5704,8 @@
 AC_SUBST(instvardir)
 AC_SUBST(srcdir)
 AC_SUBST(bindir)
+dnl Shut up spurious warnings from autoconf
+AC_DEFUN([AC_DATAROOTDIR_CHECKED])
 AC_SUBST(datadir)
 AC_SUBST(statedir)
 AC_SUBST(libdir)