This commit was generated by cvs2svn to compensate for changes in r500,

[elisp/tm.git] / inst-tm

diff --git a/inst-tm b/inst-tm
index 1e0009e..56fd824 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,19 +1,38 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.34 1996/09/04 15:43:19 morioka Exp $
+;;; $Id: inst-tm,v 7.41 1996/11/15 12:14:02 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 "../tm-mh-e/TMH-ELS")
+(defun config-tm ()
+  (let (prefix exec-prefix)
+    (setq prefix (car command-line-args-left))
+    (and prefix
+        (not (string-equal "NONE" prefix))
+        (progn
+          (defvar PREFIX prefix)
+          (setq command-line-args-left (cdr command-line-args-left))
+          )
+        (setq exec-prefix (car command-line-args-left))
+        (progn
+          (defvar EXEC_PREFIX exec-prefix)
+          ;;(setq command-line-args-left (cdr command-line-args-left))
+          )))
+  (load-file "TM-CFG")
+  (load-file "../emu/EMU-ELS")
+  (load-file "../tl/TL-ELS")
+  (load-file "../mu/MU-ELS")
+  (load-file "../mel/MEL-ELS")
+  (load-file "TM-ELS")
+  (load-file "../tm-mh-e/TMH-ELS")
+  (load-file "../tm-mail/TMAIL-ELS")
+  (load-file "../tm-vm/TM-VM-ELS")
+  (princ (format "PREFIX=%s\tEXEC_PREFIX=%s\n" PREFIX EXEC_PREFIX))
+  )
 
 (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)
+    (re-search-forward "^;;; Code:\n" nil t)
     (setq buffer-read-only nil)
 
     ;; generate tl setting
@@ -43,12 +62,27 @@
        (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))
+    (or (string= METHOD_DIR exec-directory)
+       (insert
+        (format "\n(defvar mime-viewer/external-progs %s)"
+                (let ((dir (file-relative-name METHOD_DIR data-directory)))
+                  (if (< (length dir) (length METHOD_DIR))
+                      (concat "\n  (expand-file-name \""
+                              dir "\" data-directory)")
+                    (setq dir (file-relative-name METHOD_DIR
+                                                  (expand-file-name "~/")))
+                    (if (< (length dir) (length METHOD_DIR))
+                        (concat "\n  (expand-file-name \"~/"
+                                dir "\")")
+                      (concat "\"" METHOD_DIR "\"")
+                      )))
+                ))
+       )
     (write-file "mime-setup.el")
     ))
 
 (defun compile-tm ()
+  (config-tm)
   (print load-path)
   (require 'mel-u)
   (require 'tm-edit)
@@ -56,8 +90,9 @@
   (require 'tm-mh-e)
   (make-mime-setup TL_DIR TL_RELATIVE_DIR MU_RELATIVE_DIR
                   MEL_RELATIVE_DIR TM_KERNEL_RELATIVE_DIR)
+  (compile-elisp-modules emu-modules           "../emu")
   (compile-elisp-modules tl-modules            "../tl")
-  (compile-elisp-modules mu-modules            "../mu")
+  (compile-elisp-modules mu-modules-to-compile "../mu")
   (compile-elisp-modules mel-modules           "../mel")
   (compile-elisp-modules tm-modules-to-compile ".")
   (compile-elisp-modules tm-mh-e-modules       "../tm-mh-e")
@@ -71,11 +106,14 @@
          (load "../tm-gnus/TGNUS-ELS")
         (compile-elisp-modules tm-gnus-modules-to-compile "../tm-gnus")
         ))
+  (compile-elisp-modules tm-mail-modules       "../tm-mail")
+  (compile-elisp-modules tm-vm-modules-to-compile "../tm-vm")
   )
 
 (defun install-tm ()
+  (config-tm)
   (princ (format "%s\n" emacs-version))
-  (print TL_DIR)
+  (install-elisp-modules emu-modules    "../emu"       EMU_DIR)
   (install-elisp-modules tl-modules     "../tl"        TL_DIR)
   (install-elisp-modules mu-modules     "../mu"        MU_DIR)
   (install-elisp-modules mel-modules    "../mel"       MEL_DIR)
@@ -92,10 +130,13 @@
         (load "../tm-gnus/TGNUS-ELS")
         (install-elisp-modules tm-gnus-modules "../tm-gnus" TM_GNUS_DIR)
         ))
+  (install-elisp-modules tm-mail-modules "../tm-mail"  TM_MAIL_DIR)
+  (install-elisp-modules tm-vm-modules  "../tm-vm"     TM_VM_DIR)
   (install-elisp-modules '(mime-setup)  "."    SETUP_FILE_DIR)
   )
 
 (defun install-execs ()
+  (config-tm)
   (install-files BINS      BIN_SRC_DIR    BIN_DIR)
   (install-files METHODS METHOD_SRC_DIR METHOD_DIR nil t)
   )