Mercurial > hg > xemacs-beta

diff lisp/setup-paths.el @ 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 ccceded4ee72
children 5da4cc7d5968
line wrap: on
line diff
--- a/lisp/setup-paths.el	Wed Aug 01 21:51:10 2007 +0000
+++ b/lisp/setup-paths.el	Thu Aug 02 06:33:59 2007 +0000
@@ -159,21 +159,21 @@
   "Find the site Lisp directory of the XEmacs hierarchy.
 ROOTS is a list of installation roots."
   (paths-find-site-directory roots "site-lisp"
-			     nil
+			     nil nil
 			     configure-site-directory))
 
 (defun paths-find-site-module-directory (roots)
   "Find the site modules directory of the XEmacs hierarchy.
 ROOTS is a list of installation roots."
   (paths-find-site-directory roots "site-modules"
-			     nil
+			     t nil
 			     configure-site-module-directory))
 
 (defun paths-find-lisp-directory (roots)
   "Find the main Lisp directory of the XEmacs hierarchy.
 ROOTS is a list of installation roots."
   (paths-find-version-directory roots "lisp"
-				nil
+				nil nil
 				configure-lisp-directory))
 
 (defun paths-find-mule-lisp-directory (roots &optional lisp-directory)
@@ -187,7 +187,7 @@
 	(if (paths-file-readable-directory-p guess)
 	    guess
 	  (paths-find-version-directory roots "mule-lisp"
-					nil
+					nil nil
 					configure-mule-lisp-directory)))))
 
 (defun paths-find-module-directory (roots)
@@ -265,7 +265,7 @@
      (append
       (let ((info-directory
 	     (paths-find-version-directory roots "info"
-					   nil
+					   nil nil
 					   configure-info-directory)))
 	(and info-directory
 	     (list info-directory)))
@@ -319,7 +319,7 @@
 (defun paths-find-data-directory (roots)
   "Find the data directory.
 ROOTS is the list of installation roots."
-  (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory))
+  (paths-find-version-directory roots "etc" nil "EMACSDATA" configure-data-directory))
 
 (defun paths-construct-data-directory-list (data-directory
 					    early-package-hierarchies