comparison lisp/setup-paths.el @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 4711e16a8e49
children 6240c7796c7a
comparison
equal deleted inserted replaced
370:bd866891f083 371:cc15677e0335
105 (paths-directories-which-exist configure-info-path) 105 (paths-directories-which-exist configure-info-path)
106 (paths-directories-which-exist paths-default-info-directories)))))) 106 (paths-directories-which-exist paths-default-info-directories))))))
107 107
108 (defun paths-find-doc-directory (roots) 108 (defun paths-find-doc-directory (roots)
109 "Find the documentation directory." 109 "Find the documentation directory."
110 (paths-find-architecture-directory roots "lib-src" nil configure-doc-directory)) 110 (paths-find-architecture-directory roots "lib-src"))
111 111
112 (defun paths-find-lock-directory (roots) 112 (defun paths-find-lock-directory (roots)
113 "Find the lock directory." 113 "Find the lock directory."
114 (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory)) 114 (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
115 115
124 (t 124 (t
125 (expand-file-name "!!!SuperLock!!!" lock-directory)))) 125 (expand-file-name "!!!SuperLock!!!" lock-directory))))
126 126
127 (defun paths-find-exec-directory (roots) 127 (defun paths-find-exec-directory (roots)
128 "Find the binary directory." 128 "Find the binary directory."
129 (paths-find-architecture-directory roots "lib-src" nil configure-exec-directory)) 129 (paths-find-architecture-directory roots "lib-src" configure-exec-directory))
130 130
131 (defun paths-construct-exec-path (roots exec-directory 131 (defun paths-construct-exec-path (roots exec-directory
132 early-packages late-packages last-packages) 132 early-packages late-packages last-packages)
133 "Find the binary path." 133 "Find the binary path."
134 (append 134 (append
135 (let ((path-envval (getenv "PATH"))) 135 (let ((path-envval (getenv "PATH")))
136 (if path-envval 136 (if path-envval
137 (paths-decode-directory-path path-envval 'drop-empties))) 137 (paths-decode-directory-path path-envval 'drop-empties)))
138 (packages-find-package-exec-path early-packages) 138 (packages-find-package-exec-path early-packages)
139 (packages-find-package-exec-path late-packages) 139 (packages-find-package-exec-path late-packages)
140 (packages-find-package-exec-path last-packages)
140 (let ((emacspath-envval (getenv "EMACSPATH"))) 141 (let ((emacspath-envval (getenv "EMACSPATH")))
141 (and emacspath-envval 142 (and emacspath-envval
142 (split-path emacspath-envval))) 143 (split-path emacspath-envval)))
143 (and exec-directory 144 (and exec-directory
144 (list exec-directory)) 145 (list exec-directory))))
145 (packages-find-package-exec-path last-packages)))
146 146
147 (defun paths-find-data-directory (roots) 147 (defun paths-find-data-directory (roots)
148 "Find the data directory." 148 "Find the data directory."
149 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory)) 149 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory))
150 150
152 early-packages late-packages last-packages) 152 early-packages late-packages last-packages)
153 "Find the data path." 153 "Find the data path."
154 (append 154 (append
155 (packages-find-package-data-path early-packages) 155 (packages-find-package-data-path early-packages)
156 (packages-find-package-data-path late-packages) 156 (packages-find-package-data-path late-packages)
157 (list data-directory) 157 (packages-find-package-data-path last-packages)
158 (packages-find-package-data-path last-packages))) 158 (list data-directory)))
159 159
160 ;;; setup-paths.el ends here 160 ;;; setup-paths.el ends here