Backport changes:

[elisp/wanderlust.git] / WL-MK

diff --git a/WL-MK b/WL-MK
index 008697e..0227883 100644 (file)
--- 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" "en")
+(defvar wl-info-lang (if (featurep 'mule) '("ja" "en") '("en"))
   "The language of info file (\"ja\" or \"en\").")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -243,7 +243,9 @@
       (setq icon (car icons)
            icons (cdr icons)
            dest (expand-file-name (file-name-nondirectory icon) PIXMAPDIR))
-      (princ (format "%s->%s\n" icon dest))
+      (princ (format "%s -> %s\n"
+                    (file-name-nondirectory icon)
+                    (substring (file-name-directory dest) 0 -1)))
       (copy-file icon dest t))))
 
 (defun install-wl-package ()
@@ -379,54 +381,54 @@
        )))
 
 (defun wl-texinfo-format ()
-  (unless INFODIR
-    (setq INFODIR (wl-detect-info-directory)))
-  (cond ((listp wl-info-lang)
+  (wl-detect-info-directory)
+  (cond ((null wl-info-lang))
+       ((listp wl-info-lang)
         (mapcar 'wl-texinfo-format-file wl-info-lang))
        ((stringp wl-info-lang)
         (wl-texinfo-format-file wl-info-lang))))
 
 (defun wl-texinfo-install-file (lang)
   (let ((infofile (symbol-value (intern (format "wl-%s-info" lang)))))
-    (install-file infofile DOCDIR INFODIR)))
+    (install-file infofile DOCDIR INFODIR nil 'overwrite)))
 
 (defun wl-texinfo-install ()
-  (cond ((listp wl-info-lang)
+  (cond ((null wl-info-lang))
+       ((listp wl-info-lang)
         (mapcar 'wl-texinfo-install-file wl-info-lang))
        ((stringp wl-info-lang)
         (wl-texinfo-install-file wl-info-lang))))
 
 (defun wl-primary-info-file ()
   "Get primary info file (for wl-detect-info-directory)."
-  (cond
-   ((listp wl-info-lang)
-    (let ((wl-info-lang (car wl-info-lang)))
-      (wl-primary-info-file)))
-   ((stringp wl-info-lang)
-    (symbol-value (intern (format "wl-%s-info" wl-info-lang))))))
+  (cond ((null wl-info-lang))
+       ((listp wl-info-lang)
+        (let ((wl-info-lang (car wl-info-lang)))
+          (wl-primary-info-file)))
+       ((stringp wl-info-lang)
+        (symbol-value (intern (format "wl-%s-info" wl-info-lang))))))
 
 (defun wl-detect-info-directory ()
   (config-wl-package-subr)
   ;; INFODIR check.
-  (require 'info)
-  (if (fboundp 'info-initialize)
-      (info-initialize))
-  (let ((infodir (car command-line-args-left))
-       (info (wl-primary-info-file))
-       previous INFODIR)
-    (setq INFODIR
-         (if (string= infodir "NONE")
-             (if (setq previous
-                       (exec-installed-p info Info-directory-list
-                                         COMPRESS-SUFFIX-LIST))
-                 ;;(progn
-                 ;;(condition-case nil (delete-file previous))
-                 (directory-file-name (file-name-directory previous));)
-               (car Info-directory-list))
-           infodir))
-    (setq command-line-args-left (cdr command-line-args-left))
-    (princ (format "INFODIR is %s\n\n" INFODIR))
-    INFODIR))
+  (when wl-info-lang
+    (require 'info)
+    (if (fboundp 'info-initialize)
+       (info-initialize))
+    (unless INFODIR
+      (let ((infodir (car command-line-args-left))
+           (info (wl-primary-info-file))
+           previous)
+       (setq INFODIR
+             (if (string= infodir "NONE")
+                 (if (setq previous
+                           (exec-installed-p info Info-directory-list
+                                             COMPRESS-SUFFIX-LIST))
+                     (directory-file-name (file-name-directory previous))
+                   (car Info-directory-list))
+               infodir))
+       (setq command-line-args-left (cdr command-line-args-left))))
+    (princ (format "INFODIR is %s\n\n" INFODIR))))
 
 (defun install-wl-info ()
   (wl-texinfo-format)