Delete RCS-cookie.

(compile-tm): Fix problem when gnus is installed.
(install-tm): Likewise.

diff --git a/TM-MK b/TM-MK
index 72b05a9..0e386e8 100644 (file)
--- a/TM-MK
+++ b/TM-MK
@@ -1,7 +1,8 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
-;;; $Id: TM-MK,v 7.49 1997/02/11 11:31:05 morioka Exp $
-;;;
+
+;; TM-MK: installer for tm.
+
+;;; Code:
 
 (defun config-tm ()
   (let (prefix exec-prefix)
@@ -146,16 +147,18 @@
   (compile-elisp-modules tm-mh-e-modules       "../tm-mh-e")
   (compile-elisp-module  'mime-setup           ".")
   (condition-case nil
-  (require 'gnus)
-  (cond ((featurep 'gnus-ems)
-        (load "../gnus-mime/Gnus-MIME-ELS")
-        (compile-elisp-modules gnus-mime-modules-to-compile "../gnus-mime")
-        )
-       (t
-         (load "../tm-gnus/TGNUS-ELS")
-        (compile-elisp-modules tm-gnus-modules-to-compile "../tm-gnus")
-        ))
-  (error nil))
+      (progn
+       (require 'gnus)
+       (cond ((featurep 'gnus-ems)
+              (load "../gnus-mime/Gnus-MIME-ELS")
+              (compile-elisp-modules gnus-mime-modules-to-compile
+                                     "../gnus-mime")
+              )
+             (t
+              (load "../tm-gnus/TGNUS-ELS")
+              (compile-elisp-modules tm-gnus-modules-to-compile "../tm-gnus")
+              )))
+    (error nil))
   (compile-elisp-modules tm-mail-modules       "../tm-mail")
   (compile-elisp-modules tm-vm-modules-to-compile "../tm-vm")
   )
@@ -173,17 +176,18 @@
   (install-elisp-modules tm-mh-e-modules "../tm-mh-e"  TM_MHE_DIR)
   ;;(install-tm-gnus)
   (condition-case nil
-  (require 'gnus)
-  (cond ((featurep 'gnus-ems)
-        (load "../gnus-mime/Gnus-MIME-ELS")
-        (install-elisp-modules gnus-mime-modules
-                               "../gnus-mime" Gnus_MIME_DIR)
-        )
-       (t
-        (load "../tm-gnus/TGNUS-ELS")
-        (install-elisp-modules tm-gnus-modules "../tm-gnus" TM_GNUS_DIR)
-        ))
-  (error nil))
+      (progn
+       (require 'gnus)
+       (cond ((featurep 'gnus-ems)
+              (load "../gnus-mime/Gnus-MIME-ELS")
+              (install-elisp-modules gnus-mime-modules
+                                     "../gnus-mime" Gnus_MIME_DIR)
+              )
+             (t
+              (load "../tm-gnus/TGNUS-ELS")
+              (install-elisp-modules tm-gnus-modules "../tm-gnus" TM_GNUS_DIR)
+              )))
+    (error nil))
   (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)