X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=FLIM-CFG;h=482f51f38ee202307ad10680ffa245a65c5e5f29;hb=refs%2Fheads%2Fmaster;hp=57565abcb3dd06eb7574b65b99b3de863b1d9319;hpb=4248a1b9eb6e8271990355e6393683be2a0ec54b;p=elisp%2Fflim.git

diff --git a/FLIM-CFG b/FLIM-CFG
index 57565ab..482f51f 100644
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -13,12 +13,10 @@
     (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 "emu" LISPDIR))
+      (add-to-list 'load-path (expand-file-name "apel" LISPDIR))))
 
-(defvar VERSION_SPECIFIC_LISPDIR nil)
-
-(if VERSION_SPECIFIC_LISPDIR
+(if (boundp 'VERSION_SPECIFIC_LISPDIR)
     (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
 
 (require 'install)
@@ -27,10 +25,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.
@@ -54,20 +52,16 @@
 (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 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)))
+  (install-get-default-package-directory))
 
 ;;; FLIM-CFG ends here