comparison lisp/setup-paths.el @ 274:ca9a9ec9c1c1 r21-0b35

Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children 6330739388db
comparison
equal deleted inserted replaced
273:411aac7253ef 274:ca9a9ec9c1c1
74 lisp-load-path 74 lisp-load-path
75 last-package-load-path))) 75 last-package-load-path)))
76 76
77 (defun paths-construct-info-path (roots early-packages late-packages last-packages) 77 (defun paths-construct-info-path (roots early-packages late-packages last-packages)
78 "Construct the info path." 78 "Construct the info path."
79 (append 79 (let ((info-path-envval (getenv "INFOPATH")))
80 (packages-find-package-info-path early-packages) 80 (paths-uniq-append
81 (packages-find-package-info-path late-packages) 81 (append
82 (let ((info-directory 82 (let ((info-directory
83 (paths-find-version-directory roots "info" 83 (paths-find-version-directory roots "info"
84 nil 84 nil
85 configure-info-directory))) 85 configure-info-directory)))
86 (and info-directory 86 (and info-directory
87 (list info-directory))) 87 (list info-directory)))
88 (packages-find-package-info-path last-packages) 88 (packages-find-package-info-path early-packages)
89 (let ((info-path-envval (getenv "INFOPATH"))) 89 (packages-find-package-info-path late-packages)
90 (if info-path-envval 90 (packages-find-package-info-path last-packages)
91 (decode-path-internal info-path-envval) 91 (and info-path-envval
92 (paths-directories-which-exist configure-info-path))))) 92 (decode-path-internal info-path-envval)))
93 (and (not info-path-envval)
94 (paths-uniq-append
95 (paths-directories-which-exist configure-info-path)
96 (paths-directories-which-exist '("/usr/local/info/" "/usr/info/")))))))
93 97
94 (defun paths-find-doc-directory (roots) 98 (defun paths-find-doc-directory (roots)
95 "Find the documentation directory." 99 "Find the documentation directory."
96 (paths-find-architecture-directory roots "lib-src")) 100 (paths-find-architecture-directory roots "lib-src"))
97 101
98 (defun paths-find-lock-directory (roots) 102 (defun paths-find-lock-directory (roots)
99 "Find the lock directory." 103 "Find the lock directory."
100 (paths-find-site-path roots "lock" "EMACSLOCKDIR" configure-lock-directory)) 104 (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
101 105
102 (defun paths-find-superlock-file (lock-directory) 106 (defun paths-find-superlock-file (lock-directory)
103 "Find the superlock file." 107 "Find the superlock file."
104 (cond 108 (cond
105 ((null lock-directory) 109 ((null lock-directory)