This commit was manufactured by cvs2svn to create branch 'emu-unify'.

[elisp/apel.git] / APEL-MK

diff --git a/APEL-MK b/APEL-MK
index 464edef..5b662c0 100644 (file)
--- a/APEL-MK
+++ b/APEL-MK
@@ -1,30 +1,43 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: APEL-MK,v 0.0 1997-03-14 07:23:48 morioka Exp $
+;;; $Id: APEL-MK,v 0.5 1997-11-05 15:23:35 morioka Exp $
 ;;;
 
 (defun config-apel ()
-  (let (prefix)
-    (setq prefix (car command-line-args-left))
-    (and prefix
-        (not (string-equal "NONE" prefix))
-        (progn
-          (defvar PREFIX prefix)
-          (setq command-line-args-left (cdr command-line-args-left))
-          ))
+  (let (prefix lisp-dir)
+    (and (setq prefix (car command-line-args-left))
+        (or (string-equal "NONE" prefix)
+            (defvar PREFIX prefix)
+            ))
+    (setq command-line-args-left (cdr command-line-args-left))
+    (and (setq lisp-dir (car command-line-args-left))
+        (or (string-equal "NONE" lisp-dir)
+            (defvar LISPDIR lisp-dir)
+            ))
+    (setq command-line-args-left (cdr command-line-args-left))
     (load-file "APEL-CFG")
-    (load-file "APEL-ELS")
+    (or (boundp 'apel-modules)
+       (load-file "APEL-ELS")
+       )
     (princ (format "PREFIX=%s\n" PREFIX))
     ))
 
 (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")
+  (compile-elisp-modules emu-modules   ".")
   (compile-elisp-modules apel-modules  ".")
   )
 
 (defun install-apel ()
-  (config-apel)
-  (install-elisp-modules apel-modules  "./"    APEL_DIR)
+  (compile-apel)
+  ;;(config-apel)
+  (install-elisp-modules emu-modules   "."     EMU_DIR)
+  (install-elisp-modules apel-modules  "."     APEL_DIR)
   )
 
 ;;; APEL-MK ends here