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

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