X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fupdate-elc.el;h=45b5e1dc8367af79c3ac893519ff5d0045bf4b98;hb=1a5e625ffcc6b2e9a9828a89763c062a0b09b361;hp=f88a853fe065ebcf3991644581d1e461321cab7f;hpb=a7bf8d60d66c38f62928b171842d1b45d4539077;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/update-elc.el b/lisp/update-elc.el
index f88a853..45b5e1d 100644
--- a/lisp/update-elc.el
+++ b/lisp/update-elc.el
@@ -62,8 +62,7 @@
 ;		    ;; -batch gets filtered out.
 ;		    (nthcdr 3 command-line-args))))
 
-(let ((build-root (expand-file-name ".." invocation-directory)))
-  (setq load-path (list (expand-file-name "lisp" build-root))))
+(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
 
 (load "very-early-lisp" nil t)
 
@@ -72,7 +71,7 @@
 (load "setup-paths.el")
 (load "dump-paths.el")
 
-(let ((autol (packages-list-autoloads (concat default-directory "../lisp"))))
+(let ((autol (packages-list-autoloads)))
   ;; (print (prin1-to-string autol))
   (while autol
     (let ((src (car autol)))
@@ -85,7 +84,7 @@
 ;; (print (prin1-to-string update-elc-files-to-compile))
 
 (let (preloaded-file-list site-load-packages)
-  (load (expand-file-name "../lisp/dumped-lisp.el"))
+  (load (concat default-directory "../lisp/dumped-lisp.el"))
 
   ;; Path setup
   (let ((package-preloaded-file-list