* README.en: Add explanations about

	`LISPDIR', `VERSION_SPECIFIC_LISPDIR' and `what-where'.
	* Makefile (what-where): New target.
	(install): Add new arg `VERSION_SPECIFIC_LISPDIR'.
	* APEL-MK (what-where-apel): New function.
 	(config-apel): Refer to `VERSION_SPECIFIC_LISPDIR'.
	* APEL-CFG (VERSION_SPECIFIC_LISPDIR): New variable.

diff --git a/APEL-CFG b/APEL-CFG
index 7ffb24a..fa1c828 100644 (file)
--- a/APEL-CFG
+++ b/APEL-CFG
@@ -33,10 +33,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.

diff --git a/APEL-MK b/APEL-MK
index f81dc42..09ea4c2 100644 (file)
--- a/APEL-MK
+++ b/APEL-MK
@@ -5,7 +5,7 @@
 ;;; Code:
 
 (defun config-apel ()
-  (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)
@@ -16,6 +16,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 "APEL-CFG")
     (or (boundp 'apel-modules)
        (load-file "APEL-ELS")
@@ -74,4 +82,21 @@
     (byte-compile-file (expand-file-name "custom-load.el" dir))
     ))
 
+(defun what-where-apel ()
+  (config-apel)
+  (load "EMU-ELS")
+  (princ (format "
+The files that belong to the EMU modules:
+  %s
+  -> %s
+
+The files that belong to the APEL modules:
+  %s
+  -> %s
+"
+                (mapconcat 'symbol-name emu-modules ", ")
+                EMU_DIR
+                (mapconcat 'symbol-name apel-modules ", ")
+                APEL_DIR)))
+
 ;;; APEL-MK ends here

diff --git a/ChangeLog b/ChangeLog
index 6740705..4767238 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1998-10-12  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * README.en: Add explanations about
+       `LISPDIR', `VERSION_SPECIFIC_LISPDIR' and `what-where'.
+
+       * Makefile (what-where): New target.
+       (install): Add new arg `VERSION_SPECIFIC_LISPDIR'.
+
+       * APEL-MK (what-where-apel): New function.
+       (config-apel): Refer to `VERSION_SPECIFIC_LISPDIR'.
+
+       * APEL-CFG (VERSION_SPECIFIC_LISPDIR): New variable.
+
 1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * README.en (load-path): Modify for Emacs 20.3.

diff --git a/Makefile b/Makefile
index 90dd324..2315d80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,19 +15,26 @@ FLAGS   = -batch -q -no-site-file -l APEL-MK
 PREFIX = NONE
 LISPDIR = NONE
 PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
 
 
 elc:
        $(EMACS) $(FLAGS) -f compile-apel
 
 install:
-       $(EMACS) $(FLAGS) -f install-apel $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f install-apel $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 
 install-package:
        $(XEMACS) $(FLAGS) -f install-apel-package $(PACKAGEDIR)
 
 
+what-where:
+       $(EMACS) $(FLAGS) -f what-where-apel $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
+
+
 clean:
        -rm *.elc
 

diff --git a/README.en b/README.en
index 53458f5..73bb81b 100644 (file)
--- a/README.en
+++ b/README.en
@@ -101,6 +101,22 @@ Installation
        /usr/local/share/emacs/20.2/site-lisp/  --- emu
        /usr/local/share/emacs/site-lisp/apel/  --- APEL
 
+  You can specify the lisp directory for Emacs Lisp programs,
+  for example:
+
+       % make install LISPDIR=~/elisp
+
+  You can also specify the version specific lisp directory where the
+  emu modules will be installed in, for example:
+
+       % make install VERSION_SPECIFIC_LISPDIR=~/elisp
+
+  If you would like to know what files belong to the emu modules or
+  the apel modules, or where they will be installed in, for example,
+  please type the following command.
+
+       % make what-where LISPDIR=~/elisp VERSION_SPECIFIC_LISPDIR=~/elisp
+
   You can specify other optional settings by editing the file
   APEL-CFG.  Please read comments in it.