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

[elisp/tm.git] / TM-CFG

diff --git a/TM-CFG b/TM-CFG
index d6566ca..5cb2d4f 100644 (file)
--- a/TM-CFG
+++ b/TM-CFG
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: TM-CFG,v 7.0 1996/05/20 16:24:30 morioka Exp morioka $
+;;; $Id: TM-CFG,v 7.1 1996/05/27 15:09:09 morioka Exp morioka $
 ;;;
 
 (defvar default-load-path load-path)
@@ -48,7 +48,15 @@
          (expand-file-name "../../.." exec-directory)
        (expand-file-name "../../../.." data-directory)
        )) ; install to shared directory (maybe "/usr/local")
-;;(setq PREFIX "~/")           ; install to you home directory
+;;(setq PREFIX "~/")   ; install to your home directory
+
+;; Please specify install path prefix for binaries.
+(setq EXEC_PREFIX
+      (if (or running-emacs-18 running-xemacs)
+         (expand-file-name "../../.." exec-directory)
+       (expand-file-name "../../../.." exec-directory)
+       ))
+;;(setq EXEC_PREFIX "~/")      ; install to your home directory
 
 ;; Please specify tm package prefix [optional]
 (setq TM_PACKAGE_PREFIX "")
@@ -95,7 +103,7 @@
 ;;;
 
 ;; Please specify binary path.
-(defvar BIN_DIR (expand-file-name "bin" PREFIX))
+(defvar BIN_DIR (expand-file-name "bin" EXEC_PREFIX))
 
 ;; Please specify binary path. (for external method scripts)
 (setq METHOD_DIR (expand-file-name "share/tm" PREFIX))
@@ -111,16 +119,21 @@
          "site-lisp"
        "local.lisp"))
 
+(setq PATTERN-TO-INSTALL
+      (expand-file-name (concat ".*/" LISP_PREFIX) PREFIX))
+(setq PATTERN-TO-AVOID
+      (format "%d\\.%s" emacs-major-version emacs-minor-version))
+
 (defvar LISPDIR
   (or
    (catch 'tag
      (let ((rest default-load-path)
           dir)
        (while (setq dir (car rest))
-        (if (string-match
-             (expand-file-name (concat ".*/" LISP_PREFIX) PREFIX) dir)
-            (throw 'tag (substring dir 0 (match-end 0)))
-          )
+        (or (string-match PATTERN-TO-AVOID dir)
+            (if (string-match PATTERN-TO-INSTALL dir)
+                (throw 'tag (substring dir 0 (match-end 0)))
+              ))
         (setq rest (cdr rest))
         )))
    (expand-file-name (concat
@@ -157,7 +170,7 @@
 
 
 (setq BIN_SRC_DIR "src")
-(setq BINS '("src/ol2" "src/decode-b"))
+(setq BINS '("ol2" "decode-b"))
 (setq METHOD_SRC_DIR "methods")
 (setq METHODS
       '("tm-au" "tm-file" "tm-html" "tm-image" "tm-mpeg" "tm-plain"