* README.en: Add explanation about `VERSION_SPECIFIC_LISPDIR'.

	* Makefile (install): Add new arg `VERSION_SPECIFIC_LISPDIR'.
	(elc): Likewise.
	* EMH-MK (config-emh): Refer to `VERSION_SPECIFIC_LISPDIR'.
	* EMH-CFG (VERSION_SPECIFIC_LISPDIR): New variable.

diff --git a/ChangeLog b/ChangeLog
index 25ed1cf..26e5140 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1998-10-12  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * README.en: Add explanation about `VERSION_SPECIFIC_LISPDIR'.
+
+       * Makefile (install): Add new arg `VERSION_SPECIFIC_LISPDIR'.
+       (elc): Likewise.
+
+       * EMH-MK (config-emh): Refer to `VERSION_SPECIFIC_LISPDIR'.
+
+       * EMH-CFG (VERSION_SPECIFIC_LISPDIR): New variable.
+
 1998-10-09  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * EMH-CFG: Use `add-latest-path' instead of `add-path' for adding

diff --git a/EMH-CFG b/EMH-CFG
index 3041e04..461b704 100644 (file)
--- a/EMH-CFG
+++ b/EMH-CFG
@@ -18,6 +18,11 @@
       (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
       ))
 
+(defvar VERSION_SPECIFIC_LISPDIR nil)
+
+(if VERSION_SPECIFIC_LISPDIR
+    (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
+
 (condition-case nil
     (require 'install)
   (error (error "Please install APEL 8.2 or later.")))

diff --git a/EMH-MK b/EMH-MK
index a0b39ae..0bac244 100644 (file)
--- a/EMH-MK
+++ b/EMH-MK
@@ -5,7 +5,7 @@
 ;;; Code:
 
 (defun config-emh ()
-  (let (prefix lisp-dir)
+  (let (prefix lisp-dir version-specific-lisp-dir)
     (and (setq prefix (car command-line-args-left))
         (or (string-equal "NONE" prefix)
             (defvar PREFIX prefix)
@@ -15,11 +15,22 @@
         (or (string-equal "NONE" lisp-dir)
             (defvar LISPDIR lisp-dir)
             ))
-    (load-file "EMH-CFG")
-    (load-file "EMH-ELS")
-    (princ (format "PREFIX=%s
+    (setq command-line-args-left (cdr command-line-args-left))
+    (and (setq version-specific-lisp-dir (car command-line-args-left))
+        (or (string-equal "NONE" version-specific-lisp-dir)
+            (progn
+              (defvar VERSION_SPECIFIC_LISPDIR version-specific-lisp-dir)
+              (princ (format "VERSION_SPECIFIC_LISPDIR=%s\n"
+                             VERSION_SPECIFIC_LISPDIR)))
+            ))
+    (setq command-line-args-left (cdr command-line-args-left))
+    )
+  (setq command-line-args-left (cdr command-line-args-left))
+  (load-file "EMH-CFG")
+  (load-file "EMH-ELS")
+  (princ (format "PREFIX=%s
 LISPDIR=%s\n" PREFIX LISPDIR))
-    ))
+  )
 
 (defun compile-emh ()
   (config-emh)

diff --git a/Makefile b/Makefile
index 6f4010e..8c8144f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,18 @@ FLAGS   = -batch -q -no-site-file -l EMH-MK
 PREFIX = NONE
 LISPDIR = NONE
 PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
 
 FILES =        README.en Makefile EMH-MK EMH-CFG EMH-ELS *.el ChangeLog
 
 
 elc:
-       $(EMACS) $(FLAGS) -f compile-emh $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f compile-emh $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 install:       elc
-       $(EMACS) $(FLAGS) -f install-emh $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f install-emh $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 
 package:

diff --git a/README.en b/README.en
index bb2ceb7..afedbd0 100644 (file)
--- a/README.en
+++ b/README.en
@@ -36,6 +36,12 @@ Installation
   emacs command is used (perhaps /usr/local/share/emacs/site-lisp or
   /usr/local/lib/xemacs/site-lisp).
 
+  If the emu modules (included in APEL package) have been installed in
+  the non-standard directory, you should specify where they will be
+  found, for example:
+
+       % make install VERSION_SPECIFIC_LISPDIR=~/elisp
+
   You can specify other optional settings by editing the file
   emh/EMH-CFG.