Summary: Uninstall *.img files as well.

* WL-MK (uninstall-wl-icons): New function.  Uninstall *.img
files as well.
(uninstall-wl-package): Use `uninstall-wl-icons'.

diff --git a/ChangeLog b/ChangeLog
index da8f88f..71ef369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-29  Tetsurou Okazaki  <okazaki@be.to>
+
+       * WL-MK (uninstall-wl-icons): New function.  Uninstall *.img
+       files as well.
+       (uninstall-wl-package): Use `uninstall-wl-icons'.
+
 2010-03-03  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * etc/icons/unplugged.xpm: Change design. Use `unplugged' style

diff --git a/WL-MK b/WL-MK
index d7ab2d6..88f8dc8 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -265,6 +265,19 @@
                                        "\\.img$\\|\\.xbm$")))))
     (install-files icons ICONDIR PIXMAPDIR nil 'overwrite)))
 
+(defun uninstall-wl-icons ()
+  (let* ((case-fold-search t)
+        (icons (directory-files PIXMAPDIR t "\\.img$\\|\\.x[bp]m$"))
+        icon)
+    (while icons
+      (setq icon (car icons)
+           icons (cdr icons))
+      (if (and (file-exists-p icon)
+              (file-writable-p icon))
+         (progn
+           (princ (format "%s was uninstalled.\n" icon))
+           (delete-file icon))))))
+
 (defun install-wl-package ()
   (compile-wl-package)
   (let ((wl-install-dir (expand-file-name WL_PREFIX LISPDIR))
@@ -291,17 +304,7 @@
     (wl-uninstall (wl-scan-source (list ELMODIR))
                  elmo-install-dir))
   (if PIXMAPDIR
-      (let* ((case-fold-search t)
-            (icons (directory-files PIXMAPDIR t "\\.x[bp]m$"))
-            icon)
-       (while icons
-         (setq icon (car icons)
-               icons (cdr icons))
-         (if (and (file-exists-p icon)
-                  (file-writable-p icon))
-             (progn
-               (princ (format "%s was uninstalled.\n" icon))
-               (delete-file icon)))))))
+      (uninstall-wl-icons)))
 
 
 (defun config-wl-package-xmas ()