From: tomo <tomo>
Date: Wed, 20 Dec 2006 17:24:49 +0000 (+0000)
Subject: (config-apel-package): Use `install-get-default-package-directory'.
X-Git-Tag: apel-10_7~9
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f34be87b46cf08a4f33ecbf5b6fb15a78c80c1d4;p=elisp%2Fapel.git

(config-apel-package): Use `install-get-default-package-directory'.
---

diff --git a/APEL-MK b/APEL-MK
index 7641808..1354835 100644
--- a/APEL-MK
+++ b/APEL-MK
@@ -154,30 +154,7 @@
 
   ;; Set PACKAGEDIR if not set yet.
   (or PACKAGEDIR
-      (setq PACKAGEDIR
-	    (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)))
+      (setq PACKAGEDIR (install-get-default-package-directory)))
   (if PACKAGEDIR
       (princ (format "\nPACKAGEDIR=%s\n" PACKAGEDIR))
     (error "XEmacs package system is not available")))