--- a/lisp/setup-paths.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/lisp/setup-paths.el	Mon Aug 13 11:20:41 2007 +0200
@@ -42,14 +42,10 @@
   "Depth of load-path searches in core Lisp paths.")
 
 (defvar paths-default-info-directories
-  (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")))
+  (list (paths-construct-path '("usr" "local" "info")
+			      (char-to-string directory-sep-char))
+	(paths-construct-path '("usr" "info")
+			      (char-to-string directory-sep-char)))
   "Directories appended to the end of the info path by default.")
 
 (defun paths-find-site-lisp-directory (roots)
@@ -73,7 +69,7 @@
 (defun paths-find-module-directory (roots)
   "Find the main modules directory of the XEmacs hierarchy."
   (paths-find-architecture-directory roots "modules"
-				     nil configure-module-directory))
+				configure-module-directory))
 
 (defun paths-construct-load-path
   (roots early-package-load-path late-package-load-path last-package-load-path
@@ -141,12 +137,28 @@
 
 (defun paths-find-doc-directory (roots)
   "Find the documentation directory."
-  (paths-find-architecture-directory roots "lib-src" nil configure-doc-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))))
 
 (defun paths-find-exec-directory (roots)
   "Find the binary directory."
-  (paths-find-architecture-directory roots "lib-src"
-				     nil configure-exec-directory))
+  (paths-find-architecture-directory roots "lib-src" configure-exec-directory))
 
 (defun paths-construct-exec-path (roots exec-directory
 				  early-packages late-packages last-packages)