X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=WL-MK;h=89d7af2e22a34b86a097adce9d83630c1fe45602;hb=afaaf10e4a3c0333436dd2b6aff450379c557961;hp=99f9256244673790fde30b47117cc4e09e9c0c77;hpb=3498ab2a49b1048d1d8c1359afcabc6b06fe99b3;p=elisp%2Fwanderlust.git

diff --git a/WL-MK b/WL-MK
index 99f9256..89d7af2 100644
--- a/WL-MK
+++ b/WL-MK
@@ -63,7 +63,7 @@
   (defmacro defgroup (&rest args))
   (defmacro defcustom (symbol value &optional doc &rest args)
     (let ((doc (concat "*" (or doc ""))))
-      (` (defvar (, symbol) (, value) (, doc))))))
+      `(defvar ,symbol ,value ,doc))))
 
 (load "bytecomp" nil t)
 
@@ -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.
@@ -534,7 +524,7 @@
 		  (version-tmp (split-string (match-string 1) "\\."))
 		  version news-string end)
 	      (while version-tmp
-		(setq version (append version (list (string-to-int (car version-tmp)))))
+		(setq version (append version (list (string-to-number (car version-tmp)))))
 		(setq version-tmp (cdr version-tmp)))
 	      (re-search-forward "^\\(\\* \\|\\)" nil t)
 	      (goto-char (- (match-beginning 0) 1))