From: yamaoka <yamaoka>
Date: Tue, 11 Dec 2001 04:40:00 +0000 (+0000)
Subject: * WL-MK (install-wl-icons): Don't install *.img files for Emacs 21.
X-Git-Tag: wl-2_8-root~52
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd44e582ccc0cb3d87ac3ddfe83f49203326c534;p=elisp%2Fwanderlust.git

* WL-MK (install-wl-icons): Don't install *.img files for Emacs 21.
---

diff --git a/ChangeLog b/ChangeLog
index e37834e..c00bea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* WL-MK (install-wl-icons): Don't install *.img files for Emacs 21.
+
+2001-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
 	* WL-MK (config-wl-pixmap-dir): Set a value to `PIXMAPDIR' even if
 	Emacs version is less than 21.
 	(install-wl-icons): Install icon files which might be used for the
diff --git a/WL-MK b/WL-MK
index 8c634de..043cc58 100644
--- a/WL-MK
+++ b/WL-MK
@@ -208,11 +208,10 @@
       (make-directory PIXMAPDIR t))
   (let* ((case-fold-search t)
 	 (icons (directory-files ICONDIR t
-				 (cond ((featurep 'xemacs)
+				 (cond ((or (featurep 'xemacs)
+					    (and (boundp 'emacs-major-version)
+						 (>= emacs-major-version 21)))
 					"\\.x[bp]m$")
-				       ((and (boundp 'emacs-major-version)
-					     (>= emacs-major-version 21))
-					"\\.img$\\|\\.x[bp]m$")
 				       ((featurep 'mule)
 					"\\.img$\\|\\.xbm$"))))
 	 icon dest)