X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=FLIM-CFG;h=3878aca98d446f4a6482629c919a51739ec2ba79;hb=b23f0eea91f1a8b070415cbed2dbbb5aa3a17882;hp=e4fbd6585d8cfbcd8e5c5dd45ae0ab168c17c7f7;hpb=41fe6bdf8523a73c43e73612b5df85caa5622081;p=elisp%2Fflim.git

diff --git a/FLIM-CFG b/FLIM-CFG
index e4fbd65..3878aca 100644
--- 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,10 @@
 ;; (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