X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=inst-tm;h=c0ae129cea1179b0953328660f56885b3ee073f6;hb=d26bc385edbd0d6d6abdcdaf7fb011296ff7eba8;hp=027305edb95bf1d2061a37149d8dec9b6eb66129;hpb=15cb3afb2b5a34521da0c387f61bda4a72998615;p=elisp%2Ftm.git

diff --git a/inst-tm b/inst-tm
index 027305e..c0ae129 100644
--- a/inst-tm
+++ b/inst-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 6.0 1996/05/05 11:14:38 morioka Exp $
+;;; $Id: inst-tm,v 7.8 1996/07/22 18:29:22 morioka Exp $
 ;;;
 
 (load-file "TM-CFG")
@@ -68,7 +68,6 @@
 
 (defun compile-tm ()
   (print load-path)
-  (require 'tm-rich)
   (require 'mel-u)
   (require 'tm-edit)
   (load "rmailsum")
@@ -83,28 +82,29 @@
     (set-buffer (get-buffer-create TM_GNUS_COMPILE))
     (let ((emacs (car command-line-args)))
       (insert (format "cd gnus\n%s gnus EMACS=%s PWD=`pwd`\n" MAKE emacs))
-      (cond ((string-match "XEmacs" emacs-version)
-	     (insert (format "%s sgnus EMACS=%s PWD=`pwd`\n" MAKE emacs))
+      (cond (running-xemacs-19_14-or-later
 	     )
-	    (t (cond ((<= emacs-major-version 18)
+	    (running-xemacs
+	     (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" MAKE emacs))
+	     )
+	    (t (cond (running-emacs-18
 		      (insert (format "%s gnus3 EMACS=%s PWD=`pwd`\n"
 				      MAKE emacs))
 		      (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n"
 				      MAKE emacs))
 		      )
-		     ((< emacs-minor-version 30)
+		     ((<= emacs-minor-version 29)
 		      (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n"
 				      MAKE emacs))
 		      (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" 
 				      MAKE emacs))
 		      )
 		     (t
-		      (insert (format "%s sgnus EMACS=%s PWD=`pwd`\n" 
+		      (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" 
 				      MAKE emacs))
 		      )))))
     (write-file TM_GNUS_COMPILE)
-    )
-  )
+    ))
 
 (defun install-el-file (src dest file)
   (let ((src-file (expand-file-name file src)))
@@ -119,6 +119,9 @@
     ))
 
 (defun install-el-files (src dest &rest files)
+  (or (file-exists-p dest)
+      (make-directory dest t)
+      )
   (mapcar (function (lambda (file)
 		      (install-el-file src dest file)
 		      ))
@@ -129,7 +132,15 @@
     (if (file-exists-p src-file)
 	(let ((full-path (expand-file-name file dest)))
 	  (copy-file src-file full-path t t)
-	  (delete-file src-file)
+	  (catch 'tag
+	    (while (file-exists-p src-file)
+	      (condition-case err
+		  (progn
+		    (delete-file src-file)
+		    (throw 'tag nil)
+		    )
+		(error (princ (format "%s\n" (nth 1 err))))
+		)))
 	  (princ (format "%s -> %s\n" file dest))
 	  ))
     ))
@@ -141,9 +152,6 @@
 	  files))
 
 (defun install-el-and-elc-files (src dest el-files elc-files)
-  (if (not (file-exists-p dest))
-      (make-directory dest t)
-    )
   (apply (function install-el-files)  src dest el-files)
   (apply (function install-elc-files) src dest elc-files)
   )