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

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

diff --git a/ChangeLog b/ChangeLog
index 0474389..d0db242 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.
+
+       * FLIM-MK (config-flim): Refer to `VERSION_SPECIFIC_LISPDIR'.
+
+       * FLIM-CFG (VERSION_SPECIFIC_LISPDIR): New variable.
+
 1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mel.el (mel-ccl-module): Require path-util when the running

diff --git a/FLIM-CFG b/FLIM-CFG
index 894af45..57565ab 100644 (file)
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -16,9 +16,15 @@
       (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))
+
 (require 'install)
 
 (add-latest-path "custom")
+
 (add-path default-directory)
 
 (or (fboundp 'write-region-as-binary)

diff --git a/FLIM-MK b/FLIM-MK
index 9fcf319..74af866 100644 (file)
--- a/FLIM-MK
+++ b/FLIM-MK
@@ -1,10 +1,10 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: FLIM-MK,v 1.3 1998-09-11 23:14:03 morioka Exp $
+;;; $Id: FLIM-MK,v 1.3.6.1 1998-10-12 09:32:18 yamaoka Exp $
 ;;;
 
 (defun config-flim ()
-  (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,6 +15,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 "FLIM-CFG")
     (load-file "FLIM-ELS")
     (princ (format "PREFIX=%s

diff --git a/Makefile b/Makefile
index f4d0bd3..f2be21e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ FLAGS   = -batch -q -no-site-file -l FLIM-MK
 PREFIX = NONE
 LISPDIR = NONE
 PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
 
 GOMI   = *.elc \
          *.cp *.cps *.ky *.kys *.fn *.fns *.vr *.vrs \
@@ -24,10 +25,12 @@ FILES       = README.?? Makefile FLIM-MK FLIM-CFG FLIM-ELS *.el ChangeLog
 
 
 elc:
-       $(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 install:       elc
-       $(EMACS) $(FLAGS) -f install-flim $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f install-flim $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 
 package:

diff --git a/README.en b/README.en
index ce7ff24..4dce259 100644 (file)
--- a/README.en
+++ b/README.en
@@ -87,6 +87,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
   FLIM-CFG.  Please read comments in it.