Sync up with the latest SEMI.

diff --git a/ChangeLog b/ChangeLog
index 44719a9..0f61ef8 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'.
+       (install-elc): Likewise.
+
+       * SEMI-MK (config-semi): Refer to `VERSION_SPECIFIC_LISPDIR'.
+
+       * SEMI-CFG (VERSION_SPECIFIC_LISPDIR): New variable.
+
 1998-10-08  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * semi-def.el: Restore the requirement for `custom'.

diff --git a/Makefile b/Makefile
index 4eee65f..6075230 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,17 +17,20 @@ PREFIX      = NONE
 EXEC_PREFIX = NONE
 LISPDIR = NONE
 PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
 
 GOMI   = *.elc
 
 
 elc:
        $(EMACS) $(FLAGS) -f compile-semi \
-               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR)
+               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 install-elc:   elc
        $(EMACS) $(FLAGS) -f install-semi \
-               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR)
+               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 install:       install-elc
 

diff --git a/README.en b/README.en
index 3c97c91..187752d 100644 (file)
--- a/README.en
+++ b/README.en
@@ -113,6 +113,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
+
 (c) install as a XEmacs package
 
   If you want to install to XEmacs package directory, please do

diff --git a/SEMI-CFG b/SEMI-CFG
index 152aa0a..915df3e 100644 (file)
--- a/SEMI-CFG
+++ b/SEMI-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.7 or later.")))

diff --git a/SEMI-MK b/SEMI-MK
index 11c8137..6a0de68 100644 (file)
--- a/SEMI-MK
+++ b/SEMI-MK
@@ -5,7 +5,7 @@
 ;;; Code:
 
 (defun config-semi ()
-  (let (prefix exec-prefix lisp-dir)
+  (let (prefix exec-prefix lisp-dir version-specific-lisp-dir)
     (and (setq prefix (car command-line-args-left))
         (or (string-equal "NONE" prefix)
             (defvar PREFIX prefix)
@@ -21,6 +21,14 @@
             (defvar LISPDIR lisp-dir)
             ))
     (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))
     )
   (load-file "SEMI-CFG")
   (load-file "SEMI-ELS")