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

[elisp/tm.git] / inst-tm

diff --git a/inst-tm b/inst-tm
index 9c2f796..56fd824 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.39 1996/09/06 16:18:21 morioka Exp $
+;;; $Id: inst-tm,v 7.41 1996/11/15 12:14:02 morioka Exp $
 ;;;
 
 (defun config-tm ()
@@ -18,6 +18,7 @@
           ;;(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")
@@ -31,7 +32,7 @@
 (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
@@ -61,8 +62,22 @@
        (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")
     ))
 
@@ -75,6 +90,7 @@
   (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-to-compile "../mu")
   (compile-elisp-modules mel-modules           "../mel")
@@ -97,7 +113,7 @@
 (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)