Mercurial > hg > xemacs-beta
comparison lisp/setup-paths.el @ 4092:9c0151d05116
[xemacs-hg @ 2007-08-02 06:33:04 by michaels]
2007-07-31 Mike Sperber <mike@xemacs.org>
* configure.ac: Don't divert `share' to `lib' for datadir.
Also, define AC_DATAROOTDIR_CHECKED to shut up autoconf.
2007-07-31 Mike Sperber <mike@xemacs.org>
* find-paths.el (paths-for-each-site-directory):
(paths-find-site-directory):
(paths-find-site-directories):
(paths-for-each-version-directory):
(paths-find-version-directory):
(paths-find-version-directories): Add `arch-dependent-p' argument
to distinguish between `lib' and `share'.
(paths-find-architecture-directory): Follow above change.
* packages.el (packages-find-installation-package-directories): Ditto.
* setup-paths.el (paths-find-site-lisp-directory):
(paths-find-site-module-directory):
(paths-find-lisp-directory):
(paths-find-mule-lisp-directory):
(paths-find-module-directory):
(paths-find-data-directory): Ditto.
author | michaels |
---|---|
date | Thu, 02 Aug 2007 06:33:59 +0000 |
parents | ccceded4ee72 |
children | 5da4cc7d5968 |
comparison
equal
deleted
inserted
replaced
4091:7b78a0e97947 | 4092:9c0151d05116 |
---|---|
157 | 157 |
158 (defun paths-find-site-lisp-directory (roots) | 158 (defun paths-find-site-lisp-directory (roots) |
159 "Find the site Lisp directory of the XEmacs hierarchy. | 159 "Find the site Lisp directory of the XEmacs hierarchy. |
160 ROOTS is a list of installation roots." | 160 ROOTS is a list of installation roots." |
161 (paths-find-site-directory roots "site-lisp" | 161 (paths-find-site-directory roots "site-lisp" |
162 nil | 162 nil nil |
163 configure-site-directory)) | 163 configure-site-directory)) |
164 | 164 |
165 (defun paths-find-site-module-directory (roots) | 165 (defun paths-find-site-module-directory (roots) |
166 "Find the site modules directory of the XEmacs hierarchy. | 166 "Find the site modules directory of the XEmacs hierarchy. |
167 ROOTS is a list of installation roots." | 167 ROOTS is a list of installation roots." |
168 (paths-find-site-directory roots "site-modules" | 168 (paths-find-site-directory roots "site-modules" |
169 nil | 169 t nil |
170 configure-site-module-directory)) | 170 configure-site-module-directory)) |
171 | 171 |
172 (defun paths-find-lisp-directory (roots) | 172 (defun paths-find-lisp-directory (roots) |
173 "Find the main Lisp directory of the XEmacs hierarchy. | 173 "Find the main Lisp directory of the XEmacs hierarchy. |
174 ROOTS is a list of installation roots." | 174 ROOTS is a list of installation roots." |
175 (paths-find-version-directory roots "lisp" | 175 (paths-find-version-directory roots "lisp" |
176 nil | 176 nil nil |
177 configure-lisp-directory)) | 177 configure-lisp-directory)) |
178 | 178 |
179 (defun paths-find-mule-lisp-directory (roots &optional lisp-directory) | 179 (defun paths-find-mule-lisp-directory (roots &optional lisp-directory) |
180 "Find the Mule Lisp directory of the XEmacs hierarchy. | 180 "Find the Mule Lisp directory of the XEmacs hierarchy. |
181 ROOTS is a list of installation roots." | 181 ROOTS is a list of installation roots." |
185 (file-name-as-directory | 185 (file-name-as-directory |
186 (paths-construct-path (list lisp-directory "mule"))))) | 186 (paths-construct-path (list lisp-directory "mule"))))) |
187 (if (paths-file-readable-directory-p guess) | 187 (if (paths-file-readable-directory-p guess) |
188 guess | 188 guess |
189 (paths-find-version-directory roots "mule-lisp" | 189 (paths-find-version-directory roots "mule-lisp" |
190 nil | 190 nil nil |
191 configure-mule-lisp-directory))))) | 191 configure-mule-lisp-directory))))) |
192 | 192 |
193 (defun paths-find-module-directory (roots) | 193 (defun paths-find-module-directory (roots) |
194 "Find the main modules directory of the XEmacs hierarchy. | 194 "Find the main modules directory of the XEmacs hierarchy. |
195 ROOTS is a list of installation roots." | 195 ROOTS is a list of installation roots." |
263 (let ((info-path-envval (getenv "INFOPATH"))) | 263 (let ((info-path-envval (getenv "INFOPATH"))) |
264 (paths-uniq-append | 264 (paths-uniq-append |
265 (append | 265 (append |
266 (let ((info-directory | 266 (let ((info-directory |
267 (paths-find-version-directory roots "info" | 267 (paths-find-version-directory roots "info" |
268 nil | 268 nil nil |
269 configure-info-directory))) | 269 configure-info-directory))) |
270 (and info-directory | 270 (and info-directory |
271 (list info-directory))) | 271 (list info-directory))) |
272 (packages-find-package-info-path early-package-hierarchies) | 272 (packages-find-package-info-path early-package-hierarchies) |
273 (packages-find-package-info-path late-package-hierarchies) | 273 (packages-find-package-info-path late-package-hierarchies) |
317 (packages-find-package-exec-path last-package-hierarchies))) | 317 (packages-find-package-exec-path last-package-hierarchies))) |
318 | 318 |
319 (defun paths-find-data-directory (roots) | 319 (defun paths-find-data-directory (roots) |
320 "Find the data directory. | 320 "Find the data directory. |
321 ROOTS is the list of installation roots." | 321 ROOTS is the list of installation roots." |
322 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory)) | 322 (paths-find-version-directory roots "etc" nil "EMACSDATA" configure-data-directory)) |
323 | 323 |
324 (defun paths-construct-data-directory-list (data-directory | 324 (defun paths-construct-data-directory-list (data-directory |
325 early-package-hierarchies | 325 early-package-hierarchies |
326 late-package-hierarchies | 326 late-package-hierarchies |
327 last-package-hierarchies) | 327 last-package-hierarchies) |