X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=APEL-CFG;h=cce20e77afdf7c26e41c46f00b1c98a46e509ce7;hb=93dbc292d18b23df55796d2b82d865210bcfe7fd;hp=3a8c6715f4b5f6b793a75181a17acfca455b8403;hpb=3c36b1b3a90b5136fb40311f39e19911047bd701;p=elisp%2Fapel.git

diff --git a/APEL-CFG b/APEL-CFG
index 3a8c671..cce20e7 100644
--- a/APEL-CFG
+++ b/APEL-CFG
@@ -1,13 +1,13 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
-;;; APEL-CFG: installation setting about APEL.
-;;;
+
+;; APEL-CFG: installation setting about APEL.
+
+;;; Code:
 
 (defvar default-load-path load-path)
 (setq load-path (cons (expand-file-name ".") load-path))
 (require 'install)
 
-
 ;;; @ Please specify prefix of install directory.
 ;;;
 
@@ -18,7 +18,9 @@
 
 ;; Please specify emu prefix [optional]
 (setq EMU_PREFIX
-      (if (string-match "XEmacs" emacs-version)
+      (if (or (featurep 'xemacs)
+	      (and (fboundp 'set-buffer-multibyte)
+		   (subrp (symbol-function 'set-buffer-multibyte))))
 	  "emu"
 	""))
 
@@ -30,10 +32,10 @@
 ;;; @ optional settings
 ;;;
 
-(setq EMU_DIR
-      (expand-file-name
-       EMU_PREFIX
-       (install-detect-elisp-directory PREFIX nil 'version-specific)))
+(defvar VERSION_SPECIFIC_LISPDIR
+  (install-detect-elisp-directory PREFIX nil 'version-specific))
+
+(setq EMU_DIR (expand-file-name EMU_PREFIX VERSION_SPECIFIC_LISPDIR))
 
 ;; It is generated by automatically. Please set variable `PREFIX'.
 ;; If you don't like default directory tree, please set it.
@@ -41,5 +43,20 @@
 ;; (setq install-default-elisp-directory "~/lib/emacs/lisp")
 
 (setq APEL_DIR (expand-file-name APEL_PREFIX LISPDIR))
+;; (setq APEL_DIR (expand-file-name APEL_PREFIX VERSION_SPECIFIC_LISPDIR))
+
+(defvar PACKAGEDIR
+  (if (boundp 'early-packages)
+      (let ((dirs (append (if early-package-load-path
+			      early-packages)
+			  (if late-package-load-path
+			      late-packages)
+			  (if last-package-load-path
+			      last-packages)))
+	    dir)
+	(while (not (file-exists-p
+		     (setq dir (car dirs))))
+	  (setq dirs (cdr dirs)))
+	dir)))
 
 ;;; APEL-CFG ends here