Synch with flim-1_14 branch.

[elisp/flim.git] / FLIM-CFG

diff --git a/FLIM-CFG b/FLIM-CFG
index e4fbd65..ad93717 100644 (file)
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -13,8 +13,7 @@
     (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 "apel" LISPDIR))))
 
 (if (boundp 'VERSION_SPECIFIC_LISPDIR)
     (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
@@ -25,10 +24,10 @@
 
 (add-path default-directory)
 
-(or (fboundp 'write-region-as-binary)
-    (error "Please install latest APEL 7.3 or later."))
-(or (fboundp 'insert-file-contents-as-binary)
-    (error "Please install latest APEL 7.3 or later."))
+;; (or (fboundp 'write-region-as-binary)
+;;     (error "Please install latest APEL 7.3 or later."))
+;; (or (fboundp 'insert-file-contents-as-binary)
+;;     (error "Please install latest APEL 7.3 or later."))
 
 
 ;;; @ Please specify prefix of install directory.
@@ -58,18 +57,32 @@
 ;; (setq FLIM_DIR (expand-file-name FLIM_PREFIX VERSION_SPECIFIC_LISPDIR))
 (setq FLIM_DIR (expand-file-name FLIM_PREFIX LISPDIR))
 
+(setq FLIM_VERSION_SPECIFIC_DIR
+      (expand-file-name FLIM_PREFIX VERSION_SPECIFIC_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)))
+  (let ((dirs (append
+              (cond ((boundp 'early-package-hierarchies)
+                     (append (if early-package-load-path
+                                 early-package-hierarchies)
+                             (if late-package-load-path
+                                 late-package-hierarchies)
+                             (if last-package-load-path
+                                 last-package-hierarchies)))
+                    ((boundp 'early-packages)
+                     (append (if early-package-load-path
+                                 early-packages)
+                             (if late-package-load-path
+                                 late-packages)
+                             (if last-package-load-path
+                                 last-packages))))
+              (if (and (boundp 'configure-package-path)
+                       (listp configure-package-path))
+                  (delete "" configure-package-path))))
+       dir)
+    (while (and (setq dir (car dirs))
+               (not (file-exists-p dir)))
+      (setq dirs (cdr dirs)))
+    dir))
 
 ;;; FLIM-CFG ends here