*** empty log message ***

[elisp/apel.git] / APEL-MK

diff --git a/APEL-MK b/APEL-MK
index 9543ffd..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")
@@ -24,9 +32,6 @@
     ))
 
 (defun compile-apel ()
-  ;;(add-to-list 'load-path (expand-file-name "../emu"))
-  ;;(add-to-list 'load-path ".")
-  ;;(require 'install)
   (config-apel)
   (load "EMU-ELS")
   (load-file "APEL-ELS")
@@ -36,7 +41,6 @@
 
 (defun install-apel ()
   (compile-apel)
-  ;;(config-apel)
   (install-elisp-modules emu-modules   "."     EMU_DIR)
   (install-elisp-modules apel-modules  "."     APEL_DIR)
   )
@@ -54,34 +58,45 @@
     (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR))
     ))
 
-(defun compile-apel-package ()
+(defun install-apel-package ()
   (config-apel-package)
   (load "EMU-ELS")
-  (load-file "APEL-ELS")
   
-  (setq autoload-package-name "apel")
-  (add-to-list 'command-line-args-left ".")
-  (batch-update-directory)
+  (compile-elisp-modules emu-modules   ".")
+  (compile-elisp-modules apel-modules  ".")
+  
+  (let ((dir (expand-file-name APEL_PREFIX
+                              (expand-file-name "lisp"
+                                                PACKAGEDIR))))
+    (install-elisp-modules emu-modules "." dir)
+    (install-elisp-modules apel-modules        "." dir)
+    
+    (setq autoload-package-name "apel")
+    (add-to-list 'command-line-args-left dir)
+    (batch-update-directory)
 
-  (add-to-list 'command-line-args-left ".")
-  (Custom-make-dependencies)
+    (add-to-list 'command-line-args-left dir)
+    (Custom-make-dependencies)
 
-  (compile-elisp-modules emu-modules   ".")
-  (compile-elisp-modules (append apel-modules
-                                '(auto-autoloads custom-load))
-                        ".")
-  )
+    (byte-compile-file (expand-file-name "auto-autoloads.el" dir))
+    (byte-compile-file (expand-file-name "custom-load.el" dir))
+    ))
 
-(defun install-apel-package ()
-  (config-apel-package)
+(defun what-where-apel ()
+  (config-apel)
   (load "EMU-ELS")
-  (install-elisp-modules (append emu-modules
-                                apel-modules
-                                '(mime auto-autoloads custom-load))
-                        "./"
-                        (expand-file-name APEL_PREFIX
-                                          (expand-file-name "lisp"
-                                                            PACKAGEDIR)))
-  )
+  (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