comparison lisp/setup-paths.el @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14
author cvs
date Mon, 13 Aug 2007 11:20:41 +0200
parents 501cfd01ee6d
children 11054d720c21
comparison
equal deleted inserted replaced
411:12e008d41344 412:697ef44129c6
40 40
41 (defvar paths-load-path-depth 1 41 (defvar paths-load-path-depth 1
42 "Depth of load-path searches in core Lisp paths.") 42 "Depth of load-path searches in core Lisp paths.")
43 43
44 (defvar paths-default-info-directories 44 (defvar paths-default-info-directories
45 (mapcar (function 45 (list (paths-construct-path '("usr" "local" "info")
46 (lambda (dirlist) 46 (char-to-string directory-sep-char))
47 (paths-construct-path 47 (paths-construct-path '("usr" "info")
48 dirlist (char-to-string directory-sep-char)))) 48 (char-to-string directory-sep-char)))
49 '(("usr" "local" "info")
50 ("usr" "info")
51 ("usr" "local" "share" "info")
52 ("usr" "share" "info")))
53 "Directories appended to the end of the info path by default.") 49 "Directories appended to the end of the info path by default.")
54 50
55 (defun paths-find-site-lisp-directory (roots) 51 (defun paths-find-site-lisp-directory (roots)
56 "Find the site Lisp directory of the XEmacs hierarchy." 52 "Find the site Lisp directory of the XEmacs hierarchy."
57 (paths-find-site-directory roots "site-lisp" 53 (paths-find-site-directory roots "site-lisp"
71 configure-lisp-directory)) 67 configure-lisp-directory))
72 68
73 (defun paths-find-module-directory (roots) 69 (defun paths-find-module-directory (roots)
74 "Find the main modules directory of the XEmacs hierarchy." 70 "Find the main modules directory of the XEmacs hierarchy."
75 (paths-find-architecture-directory roots "modules" 71 (paths-find-architecture-directory roots "modules"
76 nil configure-module-directory)) 72 configure-module-directory))
77 73
78 (defun paths-construct-load-path 74 (defun paths-construct-load-path
79 (roots early-package-load-path late-package-load-path last-package-load-path 75 (roots early-package-load-path late-package-load-path last-package-load-path
80 lisp-directory 76 lisp-directory
81 &optional site-lisp-directory) 77 &optional site-lisp-directory)
139 (paths-directories-which-exist configure-info-path) 135 (paths-directories-which-exist configure-info-path)
140 (paths-directories-which-exist paths-default-info-directories)))))) 136 (paths-directories-which-exist paths-default-info-directories))))))
141 137
142 (defun paths-find-doc-directory (roots) 138 (defun paths-find-doc-directory (roots)
143 "Find the documentation directory." 139 "Find the documentation directory."
144 (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory)) 140 (paths-find-architecture-directory roots "lib-src"))
141
142 (defun paths-find-lock-directory (roots)
143 "Find the lock directory."
144 (defvar configure-lock-directory)
145 (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
146
147 (defun paths-find-superlock-file (lock-directory)
148 "Find the superlock file."
149 ;; #### There is no such variable configure-superlock-file!
150 (cond
151 ((null lock-directory)
152 nil)
153 ((and configure-superlock-file
154 (file-directory-p (file-name-directory configure-superlock-file)))
155 configure-superlock-file)
156 (t
157 (expand-file-name "!!!SuperLock!!!" lock-directory))))
145 158
146 (defun paths-find-exec-directory (roots) 159 (defun paths-find-exec-directory (roots)
147 "Find the binary directory." 160 "Find the binary directory."
148 (paths-find-architecture-directory roots "lib-src" 161 (paths-find-architecture-directory roots "lib-src" configure-exec-directory))
149 nil configure-exec-directory))
150 162
151 (defun paths-construct-exec-path (roots exec-directory 163 (defun paths-construct-exec-path (roots exec-directory
152 early-packages late-packages last-packages) 164 early-packages late-packages last-packages)
153 "Find the binary path." 165 "Find the binary path."
154 (append 166 (append