X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fdump-paths.el;h=780f3addc4c5d9e4352d33e1322e84f9d479d838;hb=fe8e655a02c383927563d735c025f1044cf7d384;hp=81e4de324865a584924e7bfccc0f2fd56173d7ad;hpb=2e3e3f9ee27fec50f45c282d71eaddf7c673bc56;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/dump-paths.el b/lisp/dump-paths.el
index 81e4de3..780f3ad 100644
--- a/lisp/dump-paths.el
+++ b/lisp/dump-paths.el
@@ -39,7 +39,12 @@
       (princ (format "XEmacs thinks the roots of its hierarchy are:\n%S\n"
 		     roots)))
 
-  (let ((stuff (packages-find-packages roots)))
+  (let* ((package-locations
+	  (packages-compute-package-locations
+	   ;; temporary kludge:
+	   ;; this should be synched with startup.el
+	   (paths-construct-path '("~" ".xemacs"))))
+	 (stuff (packages-find-packages roots package-locations)))
     (setq late-packages (car (cdr stuff))))
 
   (setq late-package-load-path (packages-find-package-load-path late-packages))
@@ -67,6 +72,20 @@
 					     late-package-load-path
 					     '()
 					     lisp-directory
-					     site-directory)))
+					     site-directory))
+
+  (setq module-directory (paths-find-module-directory roots))
+  (if debug-paths
+      (princ (format "module-directory:\n%S\n" module-directory)
+	     'external-debugging-output))
+  (setq site-module-directory (and (null inhibit-site-modules)
+			    (paths-find-site-module-directory roots)))
+  (if (and debug-paths (null inhibit-site-modules))
+      (princ (format "site-module-directory:\n%S\n" site-module-directory)
+	     'external-debugging-output))
+
+  (setq module-load-path (paths-construct-module-load-path roots
+							 module-directory
+							 site-module-directory)))
 
 ;;; dump-paths.el ends here