From: yamaoka <yamaoka>
Date: Mon, 11 Dec 2006 06:49:05 +0000 (+0000)
Subject: (PACKAGEDIR): Check for (early|late|last)-package-hierarchies and
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2b6c73d689d341146902b37b9fed0a16cfd01d95;p=elisp%2Flsdb.git

(PACKAGEDIR): Check for (early|late|last)-package-hierarchies and
 configure-package-path as well as (early|late|last)-packages.
---

diff --git a/LSDB-CFG b/LSDB-CFG
index b6bea30..63ecf80 100644
--- a/LSDB-CFG
+++ b/LSDB-CFG
@@ -36,17 +36,27 @@
 (setq LSDB_DIR (expand-file-name LSDB_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)))
+  (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))
 
 ;;; LSDB-CFG ends here