(PACKAGEDIR): New variable.

(EMH_PREFIX): Change to "emh" if it is installed as a XEmacs package.

diff --git a/EMH-CFG b/EMH-CFG
index e383535..e8671f2 100644 (file)
--- a/EMH-CFG
+++ b/EMH-CFG
@@ -1,5 +1,5 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
+
 ;; EMH-CFG: installation setting about EMH.
 
 ;;; Code:
@@ -35,8 +35,25 @@
 (defvar PREFIX install-prefix)
 ;;(setq PREFIX "~/")
 
+(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)))
+
 ;; Please specify prefix for ``emh'' [optional]
-(setq EMH_PREFIX "semi")
+(setq EMH_PREFIX
+      (if PACKAGEDIR
+         "emh"
+       "semi"))
 
 \f