X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=APEL-MK;h=1354835656d4ae545d8f93c1bcc75cc37155569f;hb=25b3b26447dafb5377b06a7d615e221448838cfe;hp=58e5ddbf27b53adce616f131db32a32573a62786;hpb=ad3ba73586a7e06f1311726585c1e2c86995bda2;p=elisp%2Fapel.git

diff --git a/APEL-MK b/APEL-MK
index 58e5ddb..1354835 100644
--- a/APEL-MK
+++ b/APEL-MK
@@ -49,45 +49,6 @@
 (defvar EMU_DIR nil)			; VERSION_SPECIFIC_LISPDIR/EMU_PREFIX
 
 
-;;; Utilities. (XXX: should be moved to install.el ?)
-
-(defun install-just-print-p ()
-  (let ((flag (getenv "MAKEFLAGS"))
-	(case-fold-search nil))
-    (princ (format "%s\n" flag))
-    (if flag
-	(string-match "^\\(\\(--[^ ]+ \\)+-\\|[^ =-]\\)*n" flag))))
-
-(defun install-update-package-files (package dir &optional just-print)
-  (cond
-   (just-print
-    (princ (format "Updating autoloads in directory %s..\n\n" dir))
-
-    (princ (format "Processing %s\n" dir))
-    (princ "Generating custom-load.el...\n\n")
-
-    (princ (format "Compiling %s...\n"
-		   (expand-file-name "auto-autoloads.el" dir)))
-    (princ (format "Wrote %s\n"
-		   (expand-file-name "auto-autoloads.elc" dir)))
-
-    (princ (format "Compiling %s...\n"
-		   (expand-file-name "custom-load.el" dir)))
-    (princ (format "Wrote %s\n"
-		   (expand-file-name "custom-load.elc" dir))))
-   (t
-    (setq autoload-package-name package)
-
-    (let ((command-line-args-left (list dir)))
-      (batch-update-directory))
-
-    (let ((command-line-args-left (list dir)))
-      (Custom-make-dependencies))
-
-    (byte-compile-file (expand-file-name "auto-autoloads.el" dir))
-    (byte-compile-file (expand-file-name "custom-load.el" dir)))))
-
-
 ;;; Configure, Compile, and Install.
 
 (defun config-apel ()
@@ -157,11 +118,12 @@
   (compile-elisp-modules emu-modules-to-compile	".")
   (compile-elisp-modules apel-modules		"."))
 
-(defun install-apel ()
+(defun install-apel (&optional just-print)
   (config-apel)
-  (let ((just-print (install-just-print-p)))
-    (install-elisp-modules emu-modules	"." EMU_DIR  just-print)
-    (install-elisp-modules apel-modules	"." APEL_DIR just-print)))
+  (or just-print
+      (setq just-print (install-just-print-p)))
+  (install-elisp-modules emu-modules	"." EMU_DIR  just-print)
+  (install-elisp-modules apel-modules	"." APEL_DIR just-print))
 
 ;; For XEmacs package system.
 (defun config-apel-package ()
@@ -192,18 +154,7 @@
 
   ;; Set PACKAGEDIR if not set yet.
   (or PACKAGEDIR
-      (setq PACKAGEDIR
-	    (if (boundp 'early-packages)
-		(let ((dirs (append (if early-package-load-path
-					early-packages)
-				    (if late-package-load-path
-					late-packages)
-				    (if last-package-load-path
-					last-packages)))
-		      dir)
-		  (while (not (file-exists-p (setq dir (car dirs))))
-		    (setq dirs (cdr dirs)))
-		  dir))))
+      (setq PACKAGEDIR (install-get-default-package-directory)))
   (if PACKAGEDIR
       (princ (format "\nPACKAGEDIR=%s\n" PACKAGEDIR))
     (error "XEmacs package system is not available")))
@@ -224,21 +175,23 @@
     (install-update-package-files "apel" dir just-print)))
 
 (defun what-where-apel ()
-  (config-apel)
-  (princ (format "
-The files that belong to the EMU modules:
-  %s
-  -> %s
-
-The files that belong to the APEL modules:
-  %s
-  -> %s
-
-Do `make elc', `make install', `make package', or `make install-package'.
-"
-		 (mapconcat (function symbol-name) emu-modules ", ")
-		 EMU_DIR
-		 (mapconcat (function symbol-name) apel-modules ", ")
-		 APEL_DIR)))
+  (install-apel 'just-print)
+  ;; (config-apel)
+;;;   (princ (format "
+;;; The files that belong to the EMU modules:
+;;;   %s
+;;;   -> %s
+
+;;; The files that belong to the APEL modules:
+;;;   %s
+;;;   -> %s
+
+;;; Do `make elc', `make install', `make package', or `make install-package'.
+;;; "
+;;; 		 (mapconcat (function symbol-name) emu-modules ", ")
+;;; 		 EMU_DIR
+;;; 		 (mapconcat (function symbol-name) apel-modules ", ")
+;;; 		 APEL_DIR))
+  )
 
 ;;; APEL-MK ends here