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

diff --git a/ChangeLog b/ChangeLog
index 462d0e0..ee4b89b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-21  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * WL-MK (config-wl-package-xmas): Use
+       `install-get-default-package-directory'.
+
 2005-11-04  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * README, README.ja: Update stable branch.

diff --git a/WL-MK b/WL-MK
index 99f9256..2513518 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -310,22 +310,12 @@
   (config-wl-package-subr)
   ;; PACKAGEDIR check.
   (let (package-dir)
-    (and (setq package-dir (car command-line-args-left))
-        (if (string= "NONE" package-dir)
-            (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)))
-          (defvar PACKAGEDIR package-dir)))
+    (defvar PACKAGEDIR
+      (if (and (setq package-dir (car command-line-args-left))
+              (not (string= "NONE" package-dir)))
+         package-dir
+       (require 'install)
+       (install-get-default-package-directory)))
     (princ (format "PACKAGEDIR is %s\n" PACKAGEDIR))
     (setq command-line-args-left (cdr command-line-args-left)))
   ;; PIXMAPDIR check.