update.

[elisp/apel.git] / install.el

diff --git a/install.el b/install.el
index 6397515..4995610 100644 (file)
--- a/install.el
+++ b/install.el
@@ -3,11 +3,11 @@
 ;; Copyright (C) 1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Created: 1996/8/18
-;; Version: $Id: install.el,v 2.1 1996/09/04 13:57:50 morioka Exp $
-;; Keywords: install
+;; Created: 1996/08/18
+;; Version: $Id: install.el,v 4.2 1997/11/06 15:52:08 morioka Exp $
+;; Keywords: install, byte-compile, directory detection
 
-;; This file is part of tl (Tiny Library).
+;; This file is part of APEL (A Portable Emacs Library).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -20,14 +20,15 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
+;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
 (require 'emu)
-(require 'file-detect)
+(require 'path-util)
+
 
 ;;; @ compile Emacs Lisp files
 ;;;
@@ -61,7 +62,7 @@
     (if (file-exists-p src-file)
        (let ((full-path (expand-file-name file dest)))
          (if (and (file-exists-p full-path) overwrite)
-             (set-file-modes full-path install-overwritten-file-modes)
+              (delete-file full-path)
            )
          (copy-file src-file full-path t t)
          (if move
@@ -102,7 +103,7 @@
       (if (file-exists-p src-file)
          (let ((full-path (expand-file-name el-file dest)))
            (if (file-exists-p full-path)
-               (set-file-modes full-path install-overwritten-file-modes)
+                (delete-file full-path)
              )
            (copy-file src-file full-path t t)
            (princ (format "%s -> %s\n" el-file dest))
@@ -110,6 +111,9 @@
       (setq src-file (expand-file-name elc-file src))
       (if (file-exists-p src-file)
          (let ((full-path (expand-file-name elc-file dest)))
+            (if (file-exists-p full-path)
+                (delete-file full-path)
+              )
            (copy-file src-file full-path t t)
            (catch 'tag
              (while (file-exists-p src-file)
@@ -148,7 +152,8 @@
       "site-lisp"
     "local.lisp"))
 
-(defun install-detect-elisp-directory (&optional prefix elisp-prefix)
+(defun install-detect-elisp-directory (&optional prefix elisp-prefix
+                                                allow-version-specific)
   (or prefix
       (setq prefix install-prefix)
       )
@@ -161,15 +166,17 @@
           dir)
        (while (setq dir (car rest))
         (if (string-match
-             (concat "^"
-                     (expand-file-name (concat ".*/" elisp-prefix) prefix)
-                     "$")
+             (` (, (concat "^"
+                           (expand-file-name (concat ".*/" elisp-prefix) prefix)
+                           "/?$")))
              dir)
-            (or (string-match (format "%d\\.%d"
-                                      emacs-major-version
-                                      emacs-minor-version) dir)
+            (if (or allow-version-specific
+                    (not (string-match (format "%d\\.%d"
+                                               emacs-major-version
+                                               emacs-minor-version) dir))
+                    )
                 (throw 'tag dir)
-                ))
+              ))
         (setq rest (cdr rest))
         )))
    (expand-file-name (concat