comparison lisp/loadup.el @ 402:5a2589c672dc r21-2-31

Import from CVS: tag r21-2-31
author cvs
date Mon, 13 Aug 2007 11:14:58 +0200
parents 74fd4e045ea6
children b8cc9ab3f761
comparison
equal deleted inserted replaced
401:e0a2a2be14bf 402:5a2589c672dc
63 (insert-file-contents-internal "../Installation") 63 (insert-file-contents-internal "../Installation")
64 (fmakunbound 'format-decode) 64 (fmakunbound 'format-decode)
65 (prog1 (buffer-substring) 65 (prog1 (buffer-substring)
66 (kill-buffer (current-buffer))))) 66 (kill-buffer (current-buffer)))))
67 67
68 (setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH"))) 68 (let ((build-root (expand-file-name ".." invocation-directory)))
69 (setq module-load-path (split-path (getenv "EMACSBOOTSTRAPMODULEPATH"))) 69 (setq load-path (list (expand-file-name "lisp" build-root)))
70 (setq module-load-path (list (expand-file-name "modules" build-root))))
70 71
71 ;; message not defined yet ... 72 ;; message not defined yet ...
72 (external-debugging-output (format "\nUsing load-path %s" load-path)) 73 (external-debugging-output (format "\nUsing load-path %s" load-path))
73 (external-debugging-output (format "\nUsing module-load-path %s" 74 (external-debugging-output (format "\nUsing module-load-path %s"
74 module-load-path)) 75 module-load-path))