tm 7.92.

[elisp/tm.git] / inst-tm

diff --git a/inst-tm b/inst-tm
index 9c2f796..8268eb9 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.40 1996/10/24 08:14:02 morioka Exp $
 ;;;
 
 (defun config-tm ()
@@ -31,7 +31,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 +61,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")
     ))