comparison lisp/setup-paths.el @ 388:aabb7f5b1c81 r21-2-9

Import from CVS: tag r21-2-9
author cvs
date Mon, 13 Aug 2007 11:09:42 +0200
parents 8626e4521993
children 74fd4e045ea6
comparison
equal deleted inserted replaced
387:f892a9d0bb8d 388:aabb7f5b1c81
52 "Find the site Lisp directory of the XEmacs hierarchy." 52 "Find the site Lisp directory of the XEmacs hierarchy."
53 (paths-find-site-directory roots "site-lisp" 53 (paths-find-site-directory roots "site-lisp"
54 nil 54 nil
55 configure-site-directory)) 55 configure-site-directory))
56 56
57 (defun paths-find-site-module-directory (roots)
58 "Find the site modules directory of the XEmacs hierarchy."
59 (paths-find-site-directory roots "site-modules"
60 nil
61 configure-site-module-directory))
62
57 (defun paths-find-lisp-directory (roots) 63 (defun paths-find-lisp-directory (roots)
58 "Find the main Lisp directory of the XEmacs hierarchy." 64 "Find the main Lisp directory of the XEmacs hierarchy."
59 (paths-find-version-directory roots "lisp" 65 (paths-find-version-directory roots "lisp"
60 nil 66 nil
61 configure-lisp-directory)) 67 configure-lisp-directory))
68
69 (defun paths-find-module-directory (roots)
70 "Find the main modules directory of the XEmacs hierarchy."
71 (paths-find-architecture-directory roots "modules"
72 configure-module-directory))
62 73
63 (defun paths-construct-load-path 74 (defun paths-construct-load-path
64 (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
65 lisp-directory 76 lisp-directory
66 &optional site-lisp-directory) 77 &optional site-lisp-directory)
81 early-package-load-path 92 early-package-load-path
82 site-lisp-load-path 93 site-lisp-load-path
83 late-package-load-path 94 late-package-load-path
84 lisp-load-path 95 lisp-load-path
85 last-package-load-path))) 96 last-package-load-path)))
97
98 (defun paths-construct-module-load-path
99 (root module-directory &optional site-module-directory)
100 "Construct the modules load path."
101 (let* ((envvar-value (getenv "EMACSMODULEPATH"))
102 (env-module-path
103 (and envvar-value
104 (paths-decode-directory-path envvar-value 'drop-empties)))
105 (site-module-load-path
106 (and site-module-directory
107 (paths-find-recursive-load-path (list site-module-directory)
108 paths-load-path-depth)))
109 (module-load-path
110 (and module-directory
111 (paths-find-recursive-load-path (list module-directory)
112 paths-load-path-depth))))
113 (append env-module-path
114 site-module-load-path
115 module-load-path)))
86 116
87 (defun paths-construct-info-path (roots early-packages late-packages last-packages) 117 (defun paths-construct-info-path (roots early-packages late-packages last-packages)
88 "Construct the info path." 118 "Construct the info path."
89 (let ((info-path-envval (getenv "INFOPATH"))) 119 (let ((info-path-envval (getenv "INFOPATH")))
90 (paths-uniq-append 120 (paths-uniq-append