(PACKAGEDIR): New variable.

(MU_DIR): Use `VERSION_SPECIFIC_LISPDIR' instead of `LISPDIR'.
(VERSION_SPECIFIC_LISPDIR): New variable.
(TopLevel): Delete code to detect APEL 7.3 or later.
(load-path): Modernize the way of adding the paths of APEL, FLIM, LISPDIR,
VERSION_SPECIFIC_LISPDIR, CUSTOM and `default-directory'.
(default-load-path): New variable.
;; Contributed by Kenji Itoh <keit@tpj.co.jp>.

diff --git a/MU-CFG b/MU-CFG
index 5523375..4944e16 100644 (file)
--- a/MU-CFG
+++ b/MU-CFG
@@ -4,17 +4,31 @@
 
 ;;; Code:
 
-(setq load-path (append
-                (mapcar (function
-                         (lambda (path)
-                           (expand-file-name path (getenv "PWD"))
-                           ))
-                        '("." "../apel" "../flim")
-                        )
-                load-path))
+(defvar default-load-path load-path)
+
+(add-to-list 'load-path
+            (expand-file-name "../../site-lisp/apel" data-directory))
+
+(add-to-list 'load-path
+            (expand-file-name "../../site-lisp/flim" data-directory))
+
+(if (boundp 'LISPDIR)
+    (progn
+      (add-to-list 'default-load-path LISPDIR)
+      (add-to-list 'load-path LISPDIR)
+      (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
+      (add-to-list 'load-path (expand-file-name "flim" LISPDIR))
+      ))
+
+(if (boundp 'VERSION_SPECIFIC_LISPDIR)
+    (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
 
 (require 'install)
 
+(add-latest-path "custom")
+
+(add-path default-directory)
+
 
 ;;; @ Please specify prefix of install directory.
 ;;;
@@ -37,6 +51,23 @@
 (defvar LISPDIR (install-detect-elisp-directory PREFIX))
 ;; (setq install-default-elisp-directory "~/lib/emacs/lisp")
 
+(defvar VERSION_SPECIFIC_LISPDIR
+  (install-detect-elisp-directory PREFIX nil 'version-specific))
+
 (setq MU_DIR (expand-file-name MU_PREFIX LISPDIR))
 
+(defvar PACKAGEDIR
+  (if (boundp 'early-packages)
+      (let ((dirs (append (if early-package-load-path
+                             early-packages)
+                         (if late-package-load-path
+                             late-packages)
+                         (if last-package-load-path
+                             last-packages)))
+           dir)
+       (while (not (file-exists-p
+                    (setq dir (car dirs))))
+         (setq dirs (cdr dirs)))
+       dir)))
+
 ;;; MU-CFG ends here