From: yamaoka <yamaoka>
Date: Mon, 11 Dec 2006 04:48:40 +0000 (+0000)
Subject: Synch with flim-1_14 branch.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f16197a5d9f18de4dce3e1ed124a64483efe73fd;p=elisp%2Fflim.git

Synch with flim-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index c2ee5fd..8da9a18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* FLIM-CFG (PACKAGEDIR): Check for
+	(early|late|last)-package-hierarchies and configure-package-path
+	as well as (early|late|last)-packages.
+
 2006-06-15  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* smtp.el (smtp-submit-package): Ignore error in
diff --git a/FLIM-CFG b/FLIM-CFG
index 8a314fd..b7040db 100644
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -61,17 +61,27 @@
       (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 (not (file-exists-p (setq dir (car dirs))))
+      (setq dirs (cdr dirs)))
+    dir))
 
 ;;; FLIM-CFG ends here