X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=install.el;h=2d9dd411323f3673f60cda24f50f8a2864c407f9;hb=905f8ac6008bb2439e913f04b3af1685f0e09c9e;hp=2d66b19d32c56530e85e0b610d1e816d2ef9ec83;hpb=bcf8bba7e3bb60be21e0fbc00a5533d6ebe6986d;p=elisp%2Fapel.git

diff --git a/install.el b/install.el
index 2d66b19..2d9dd41 100644
--- a/install.el
+++ b/install.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(require 'poe)				; make-directory (for v18)
+(require 'poe)				; make-directory for v18
 (require 'path-util)			; default-load-path
 
 
@@ -41,16 +41,17 @@
 	(byte-compile-file el-file))))
 
 (defun compile-elisp-modules (modules &optional path every-time)
-  (mapcar (function
-	   (lambda (module)
-	     (compile-elisp-module module path every-time)))
-	  modules))
+  (mapcar
+   (function
+    (lambda (module)
+      (compile-elisp-module module path every-time)))
+   modules))
 
 
 ;;; @ install files
 ;;;
 
-(defvar install-overwritten-file-modes (+ (* 64 6)(* 8 4) 4))
+(defvar install-overwritten-file-modes (+ (* 64 6)(* 8 4) 4)) ; 0644
 
 (defun install-file (file src dest &optional move overwrite just-print)
   (if just-print
@@ -75,10 +76,11 @@
 (defun install-files (files src dest &optional move overwrite just-print)
   (or (file-exists-p dest)
       (make-directory dest t))
-  (mapcar (function
-	   (lambda (file)
-	     (install-file file src dest move overwrite just-print)))
-	  files))
+  (mapcar
+   (function
+    (lambda (file)
+      (install-file file src dest move overwrite just-print)))
+   files))
 
 
 ;;; @@ install Emacs Lisp files
@@ -120,10 +122,11 @@
 (defun install-elisp-modules (modules src dest &optional just-print)
   (or (file-exists-p dest)
       (make-directory dest t))
-  (mapcar (function
-	   (lambda (module)
-	     (install-elisp-module module src dest just-print)))
-	  modules))
+  (mapcar
+   (function
+    (lambda (module)
+      (install-elisp-module module src dest just-print)))
+   modules))
 
 
 ;;; @ detect install path
@@ -131,8 +134,8 @@
 
 ;; install to shared directory (maybe "/usr/local")
 (defvar install-prefix
-  (if (or (<= emacs-major-version 18)	; running-emacs-18
-	  (featurep 'xemacs)		; running-xemacs
+  (if (or (<= emacs-major-version 18)
+	  (featurep 'xemacs)
 	  (and (boundp 'system-configuration-options) ; 19.29 or later
 	       (string= system-configuration-options "NT"))) ; for Meadow
       (expand-file-name "../../.." exec-directory)
@@ -141,6 +144,7 @@
 (defvar install-elisp-prefix
   (if (>= emacs-major-version 19)
       "site-lisp"
+    ;; v18 does not have standard site directory.
     "local.lisp"))
 
 (defun install-detect-elisp-directory (&optional prefix elisp-prefix
@@ -149,38 +153,39 @@
       (setq prefix install-prefix))
   (or elisp-prefix
       (setq elisp-prefix install-elisp-prefix))
-  (or
-   (catch 'tag
-     (let ((rest default-load-path)
-	   (pat (concat "^"
-			(expand-file-name (concat ".*/" elisp-prefix) prefix)
-			"/?$")))
-       (while rest
-	 (if (string-match pat (car rest))
-	     (if (or allow-version-specific
-		     (not (string-match (format "/%d\\.%d"
-						emacs-major-version
-						emacs-minor-version)
-					(car rest))))
-		 (throw 'tag (car rest))))
-	 (setq rest (cdr rest)))))
-   (expand-file-name (concat
-		      (if (and		; running-emacs-19_29-or-later
-			   (not (featurep 'xemacs))
-			   (or (>= emacs-major-version 20)
-			       (and (= emacs-major-version 19)
-				    (>= emacs-minor-version 29))))
-			  "share/"
-			"lib/")
-		      (cond ((boundp 'NEMACS) "nemacs/")
-			    ((boundp 'MULE)   "mule/")
-			    ((featurep 'xemacs)	; running-xemacs
-			     (if (featurep 'mule)
-				 "xmule/"
-			       "xemacs/"))
-			    (t "emacs/"))
-		      elisp-prefix)
-		     prefix)))
+  (or (catch 'tag
+	(let ((rest default-load-path)
+	      (regexp (concat "^"
+			      (expand-file-name (concat ".*/" elisp-prefix)
+						prefix)
+			      "/?$")))
+	  (while rest
+	    (if (string-match regexp (car rest))
+		(if (or allow-version-specific
+			(not (string-match (format "/%d\\.%d"
+						   emacs-major-version
+						   emacs-minor-version)
+					   (car rest))))
+		    (throw 'tag (car rest))))
+	    (setq rest (cdr rest)))))
+      (expand-file-name (concat (if (and (not (featurep 'xemacs))
+					 (or (>= emacs-major-version 20)
+					     (and (= emacs-major-version 19)
+						  (> emacs-minor-version 28))))
+				    "share/"
+				  "lib/")
+				(cond
+				 ((featurep 'xemacs)
+				  (if (featurep 'mule)
+				      "xmule/"
+				    "xemacs/"))
+				 ;; unfortunately, unofficial mule based on
+				 ;; 19.29 and later use "emacs/" by default.
+				 ((boundp 'MULE) "mule/")
+				 ((boundp 'NEMACS) "nemacs/")
+				 (t "emacs/"))
+				elisp-prefix)
+			prefix)))
 
 (defvar install-default-elisp-directory
   (install-detect-elisp-directory))
@@ -189,6 +194,7 @@
 ;;; @ end
 ;;;
 
-(provide 'install)
+(require 'product)
+(product-provide (provide 'install) (require 'apel-ver))
 
 ;;; install.el ends here