X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fsetup-paths.el;h=f26dad89d740e45faacf2490c3cc248622b75fe0;hb=707ae753601d8478a5144878367604b6d8222698;hp=b275db2569773c5b09e173c2e07dbcb4e9edafd5;hpb=f3ec20f455f3f1212d2c5ee4cadc984330da9c38;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index b275db2..f26dad8 100644
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -42,10 +42,14 @@
   "Depth of load-path searches in core Lisp paths.")
 
 (defvar paths-default-info-directories
-  (list (paths-construct-path '("usr" "local" "info")
-			      (char-to-string directory-sep-char))
-	(paths-construct-path '("usr" "info")
-			      (char-to-string directory-sep-char)))
+  (mapcar (function
+	   (lambda (dirlist)
+	     (paths-construct-path
+	      dirlist (char-to-string directory-sep-char))))
+	  '(("usr" "local" "info")
+	    ("usr" "info")
+	    ("usr" "local" "share" "info")
+	    ("usr" "share" "info")))
   "Directories appended to the end of the info path by default.")
 
 (defun paths-find-site-lisp-directory (roots)
@@ -69,7 +73,7 @@
 (defun paths-find-module-directory (roots)
   "Find the main modules directory of the XEmacs hierarchy."
   (paths-find-architecture-directory roots "modules"
-				configure-module-directory))
+				     nil configure-module-directory))
 
 (defun paths-construct-load-path
   (roots early-package-load-path late-package-load-path last-package-load-path
@@ -137,28 +141,12 @@
 
 (defun paths-find-doc-directory (roots)
   "Find the documentation directory."
-  (paths-find-architecture-directory roots "lib-src"))
-
-(defun paths-find-lock-directory (roots)
-  "Find the lock directory."
-  (defvar configure-lock-directory)
-  (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
-
-(defun paths-find-superlock-file (lock-directory)
-  "Find the superlock file."
-  ;; #### There is no such variable configure-superlock-file!
-  (cond
-   ((null lock-directory)
-    nil)
-   ((and configure-superlock-file
-	 (file-directory-p (file-name-directory configure-superlock-file)))
-    configure-superlock-file)
-   (t
-    (expand-file-name "!!!SuperLock!!!" lock-directory))))
+  (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory))
 
 (defun paths-find-exec-directory (roots)
   "Find the binary directory."
-  (paths-find-architecture-directory roots "lib-src" configure-exec-directory))
+  (paths-find-architecture-directory roots "lib-src"
+				     nil configure-exec-directory))
 
 (defun paths-construct-exec-path (roots exec-directory
 				  early-packages late-packages last-packages)