comparison lisp/setup-paths.el @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29
author cvs
date Mon, 13 Aug 2007 11:13:30 +0200
parents aabb7f5b1c81
children 501cfd01ee6d
comparison
equal deleted inserted replaced
397:f4aeb21a5bad 398:74fd4e045ea6
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 (list (paths-construct-path '("usr" "local" "info") 45 (mapcar (function
46 (char-to-string directory-sep-char)) 46 (lambda (dirlist)
47 (paths-construct-path '("usr" "info") 47 (paths-construct-path
48 (char-to-string directory-sep-char))) 48 dirlist (char-to-string directory-sep-char))))
49 '(("usr" "local" "info")
50 ("usr" "info")
51 ("usr" "local" "share" "info")
52 ("usr" "share" "info")))
49 "Directories appended to the end of the info path by default.") 53 "Directories appended to the end of the info path by default.")
50 54
51 (defun paths-find-site-lisp-directory (roots) 55 (defun paths-find-site-lisp-directory (roots)
52 "Find the site Lisp directory of the XEmacs hierarchy." 56 "Find the site Lisp directory of the XEmacs hierarchy."
53 (paths-find-site-directory roots "site-lisp" 57 (paths-find-site-directory roots "site-lisp"
67 configure-lisp-directory)) 71 configure-lisp-directory))
68 72
69 (defun paths-find-module-directory (roots) 73 (defun paths-find-module-directory (roots)
70 "Find the main modules directory of the XEmacs hierarchy." 74 "Find the main modules directory of the XEmacs hierarchy."
71 (paths-find-architecture-directory roots "modules" 75 (paths-find-architecture-directory roots "modules"
72 configure-module-directory)) 76 nil configure-module-directory))
73 77
74 (defun paths-construct-load-path 78 (defun paths-construct-load-path
75 (roots early-package-load-path late-package-load-path last-package-load-path 79 (roots early-package-load-path late-package-load-path last-package-load-path
76 lisp-directory 80 lisp-directory
77 &optional site-lisp-directory) 81 &optional site-lisp-directory)
135 (paths-directories-which-exist configure-info-path) 139 (paths-directories-which-exist configure-info-path)
136 (paths-directories-which-exist paths-default-info-directories)))))) 140 (paths-directories-which-exist paths-default-info-directories))))))
137 141
138 (defun paths-find-doc-directory (roots) 142 (defun paths-find-doc-directory (roots)
139 "Find the documentation directory." 143 "Find the documentation directory."
140 (paths-find-architecture-directory roots "lib-src")) 144 (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory))
141 145
142 (defun paths-find-lock-directory (roots) 146 (defun paths-find-lock-directory (roots)
143 "Find the lock directory." 147 "Find the lock directory."
144 (defvar configure-lock-directory) 148 (defvar configure-lock-directory)
145 (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory)) 149 (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
156 (t 160 (t
157 (expand-file-name "!!!SuperLock!!!" lock-directory)))) 161 (expand-file-name "!!!SuperLock!!!" lock-directory))))
158 162
159 (defun paths-find-exec-directory (roots) 163 (defun paths-find-exec-directory (roots)
160 "Find the binary directory." 164 "Find the binary directory."
161 (paths-find-architecture-directory roots "lib-src" configure-exec-directory)) 165 (paths-find-architecture-directory roots "lib-src"
166 nil configure-exec-directory))
162 167
163 (defun paths-construct-exec-path (roots exec-directory 168 (defun paths-construct-exec-path (roots exec-directory
164 early-packages late-packages last-packages) 169 early-packages late-packages last-packages)
165 "Find the binary path." 170 "Find the binary path."
166 (append 171 (append