From: yoichi <yoichi>
Date: Sat, 22 Jun 2002 05:19:22 +0000 (+0000)
Subject: * WL-MK (wl-texinfo-format): Move condition for INFODIR	into
X-Git-Tag: elmo-mark-root~73
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b01cf923023174256f97bbb5adcc802d4c1bb336;p=elisp%2Fwanderlust.git

* WL-MK (wl-texinfo-format): Move condition for INFODIR	into
wl-detect-info-directory.
(wl-detect-info-directory): Check INFODIR after WL-CFG is loaded.
---

diff --git a/ChangeLog b/ChangeLog
index 63b18aa..77f6f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-22  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* WL-MK (wl-texinfo-format): Move condition for INFODIR	into
+	wl-detect-info-directory.
+	(wl-detect-info-directory): Check INFODIR after WL-CFG is loaded.
+
 2002-06-17  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* WL-MK (wl-texinfo-install-file): Overwrite existing info.
diff --git a/WL-MK b/WL-MK
index fbc9789..c42e4f3 100644
--- a/WL-MK
+++ b/WL-MK
@@ -381,8 +381,7 @@
 	)))
 
 (defun wl-texinfo-format ()
-  (unless INFODIR
-    (setq INFODIR (wl-detect-info-directory)))
+  (wl-detect-info-directory)
   (cond ((listp wl-info-lang)
 	 (mapcar 'wl-texinfo-format-file wl-info-lang))
 	((stringp wl-info-lang)
@@ -413,22 +412,22 @@
   (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))
+  (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))
+		    ;;(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)))
 
 (defun install-wl-info ()
   (wl-texinfo-format)