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

[elisp/tm.git] / inst-tm

diff --git a/inst-tm b/inst-tm
index b12c228..c0ae129 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.0 1996/05/08 15:05:03 morioka Exp morioka $
+;;; $Id: inst-tm,v 7.8 1996/07/22 18:29:22 morioka Exp $
 ;;;
 
 (load-file "TM-CFG")
@@ -82,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)))
@@ -118,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)
                      ))
@@ -128,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))
          ))
     ))
@@ -140,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)
   )