X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=inst-tm;h=80b1c033da9dc5b8702e41a23ac311a87d82e6ff;hb=29e661110079bf0d047d34fa64f7a963d06b7522;hp=8996bc8881446fadb991adbc29c66fd881cca1f5;hpb=64f6da47517dd7323f789a3a6afa5ce5221b08cb;p=elisp%2Ftm.git

diff --git a/inst-tm b/inst-tm
index 8996bc8..80b1c03 100644
--- a/inst-tm
+++ b/inst-tm
@@ -1,23 +1,24 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.23 1996/08/22 14:28:43 morioka Exp morioka $
+;;; $Id: inst-tm,v 7.30 1996/09/02 15:33:00 morioka Exp $
 ;;;
 
 (load-file "TM-CFG")
 (load-file "../tl/TL-ELS")
+(load-file "../mu/MU-ELS")
 (load-file "../mel/MEL-ELS")
 (load-file "TM-ELS")
 (load-file "mh-e/TMH-ELS")
 
-(defun make-mime-setup (tl-path mel-path tm-path)
+(defun make-mime-setup (tl-absolute-path tl-path mu-path mel-path tm-path)
   (let ((buf (find-file "mime-setup.el.in")))
     (goto-char (point-min))
     (re-search-forward "^;;; Code:" nil t)
     (setq buffer-read-only nil)
-    (if (member tl-path default-load-path)
-	(insert "
 
-\(require \'tl-misc)")
+    ;; generate tl setting
+    (if (member tl-absolute-path default-load-path)
+	(insert "\n(require \'tl-misc)")
       (insert
        (format "
 
@@ -26,18 +27,24 @@
              load-path)))
   (require \'tl-misc)
   )
-\(add-path \"%s\")" tl-path tl-path))
+\(add-path \"%s\")" tl-absolute-path tl-path))
       )
+    
+    ;; generate MU load-path setting
+    (or (member mu-path default-load-path)
+	(insert (format "\n(add-path \"%s\")" mu-path)))
+    
+    ;; generate MEL load-path setting
     (or (member mel-path default-load-path)
-	(insert
-	 (format "
-\(add-path \"%s\")" mel-path)))
+	(insert (format "\n(add-path \"%s\")" mel-path)))
+    
+    ;; generate tm load-path setting
     (or (member tm-path default-load-path)
-	(insert
-	 (format "
-\(add-path \"%s\")" tm-path)))
-    (insert (format "
-(defvar mime-viewer/external-progs \"%s\")" METHOD_DIR))
+	(insert (format "\n(add-path \"%s\")" tm-path)))
+    
+    ;; generate tm external-methods path setting
+    (insert
+     (format "\n(defvar mime-viewer/external-progs \"%s\")" METHOD_DIR))
     (write-file "mime-setup.el")
     ))
 
@@ -59,8 +66,10 @@
   (require 'tm-edit)
   (load "rmailsum")
   (require 'tm-mh-e)
-  (make-mime-setup TL_DIR MEL_DIR TM_KERNEL_DIR)
+  (make-mime-setup TL_DIR TL_RELATIVE_DIR MU_RELATIVE_DIR
+		   MEL_RELATIVE_DIR TM_KERNEL_RELATIVE_DIR)
   (compile-elisp-modules tl-modules		"../tl/")
+  (compile-elisp-modules mu-modules		"../mu/")
   (compile-elisp-modules mel-modules		"../mel/")
   (compile-elisp-modules tm-modules-to-compile	".")
   (compile-elisp-modules tm-mh-e-modules	"mh-e/")
@@ -93,21 +102,16 @@
     (write-file TM_GNUS_COMPILE)
     ))
 
-(defun install-el-and-elc-files (src dest el-files elc-files)
-  (install-files el-files src dest nil t)
-  (install-files elc-files src dest 'move)
-  )
-
 (defun install-tm ()
   (princ (format "%s\n" emacs-version))
   (print TL_DIR)
-  (install-el-and-elc-files "../tl/" TL_DIR tl-el-files tl-elc-files)
+  (install-elisp-modules tl-modules	 "../tl/"	TL_DIR)
+  (install-elisp-modules mu-modules	 "../mu/"	MU_DIR)
   (install-elisp-modules mel-modules	 "../mel/"	MEL_DIR)
   (install-elisp-modules tm-modules	 "./"		TM_KERNEL_DIR)
   (install-elisp-modules tm-mh-e-modules "mh-e/"	TM_MHE_DIR)
   (install-tm-gnus)
-  (install-el-and-elc-files "./" SETUP_FILE_DIR
-			    '("mime-setup.el") '("mime-setup.elc"))
+  (install-elisp-modules '(mime-setup)	 "./"	SETUP_FILE_DIR)
   )
 
 (defun install-execs ()