X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=WL-MK;h=e6462bf3b85da039fe3025c87e57a3c5031fd1d7;hb=7f48b955f3b8da23ddcf1e76c38790867ce8b635;hp=8872b03af5c93aa030f138dd25124031609065bf;hpb=89c09e760e0bc7a043fdcf97f6be52742c3f893d;p=elisp%2Fwanderlust.git

diff --git a/WL-MK b/WL-MK
index 8872b03..e6462bf 100644
--- a/WL-MK
+++ b/WL-MK
@@ -28,7 +28,7 @@
 (defconst wl-en-info "wl.info")
 (defconst wl-en-texi "wl.texi")
 
-(defvar wl-info-lang "ja"
+(defvar wl-info-lang '("ja" "en")
   "The language of info file (\"ja\" or \"en\").")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -96,7 +96,6 @@
     (setq load-path (cons (expand-file-name ".") load-path))
     (setq load-path (cons (expand-file-name WLDIR)
 			  (cons (expand-file-name ELMODIR) load-path)))
-    (setq wl-icon-dir (expand-file-name ICONDIR))
     ;; load custom file if exists.  `WL-CFG.el' override for committer.
     (load "./WL-CFG" t nil nil)
     ;; load-path
@@ -119,10 +118,7 @@
       (if (string= pixmap-dir "NONE")
 	  (if packagedir
 	      (expand-file-name "etc/wl/" packagedir)
-	    (if (or (featurep 'xemacs)
-		    (and (boundp 'emacs-major-version)
-			 (>= emacs-major-version 21)))
-		(expand-file-name "wl/icons/" data-directory)))
+	    (expand-file-name "wl/icons/" data-directory))
 	pixmap-dir)))
   (if PIXMAPDIR
       (princ (format "PIXMAPDIR is %s\n" PIXMAPDIR)))
@@ -210,7 +206,14 @@
   (if (not (file-directory-p PIXMAPDIR))
       (make-directory PIXMAPDIR t))
   (let* ((case-fold-search t)
-	 (icons (directory-files ICONDIR t "\\.x[bp]m$"))
+	 (icons (directory-files ICONDIR t
+				 (cond ((featurep 'xemacs)
+					"\\.x[bp]m$")
+				       ((and (boundp 'emacs-major-version)
+					     (>= emacs-major-version 21))
+					"\\.img$\\|\\.x[bp]m$")
+				       ((featurep 'mule)
+					"\\.img$\\|\\.xbm$"))))
 	 icon dest)
     (while icons
       (setq icon (car icons)