Don't require poem' instead of mcs-20'.

wanderlust · Dec 20, 2000 · 5939b9c · 5939b9c
1 parent 0fd5af1
commit 5939b9c
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 98 deletions.
diff --git a/APEL-MK b/APEL-MK
@@ -49,6 +49,45 @@
 (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 ()
@@ -118,12 +157,11 @@
   (compile-elisp-modules emu-modules-to-compile	".")
   (compile-elisp-modules apel-modules		"."))
 
-(defun install-apel (&optional just-print)
+(defun install-apel ()
   (config-apel)
-  (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))
+  (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)))
 
 ;; For XEmacs package system.
 (defun config-apel-package ()
@@ -186,23 +224,21 @@
     (install-update-package-files "apel" dir just-print)))
 
 (defun what-where-apel ()
-  (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))
-  )
+  (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
diff --git a/ChangeLog b/ChangeLog
@@ -1,33 +1,3 @@
-2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
-
-	* APEL-MK (install-apel): Add new optional argument `just-print'.
-	(what-where-apel): New implementation [use `install-apel' with
-	`just-print' mode].
-
-2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
-
-	* APEL-MK (install-just-print-p): Moved to install.el.
-	(install-update-package-files): Moved to install.el.
-
-	* install.el (install-update-package-files): New function [moved
-	from APEL-MK].
-	(install-just-print-p): Likewise.
-
-2000-12-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
-
-	* mcs-xm.el: Don't require `poem' instead of `mcs-20'.
-
-	* mcs-e20.el: Don't require mcs-20.
-
-	* mcs-20.el: - Don't require `poem'.
-	- Require `custom' instead of `pcustom'.
-	- Require mcs-xm for XEmacs-Mule.
-	- Require mcs-e20 for GNU Emacs 20.1 or later.
-	(default-mime-charset): Change initial value to `x-unknown'.
-
-	* mcharset.el: Require mcs-20 if running with XEmacs-Mule and GNU
-	Emacs 20.1 or later.
-
 2000-12-19  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* poe.el (current-fill-column): New emulating function.
@@ -2758,7 +2728,7 @@
 
 	* APEL: Version 8.4 was released.
 
-	* EMU-ELS: Don't use HIRAGANA LETTER A ($(B$"(B) to detect character
+	* EMU-ELS: Don't use HIRAGANA LETTER A ($B$"(B) to detect character
  	indexing (Emacs 20.3 or later).
 
 1998-04-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>

diff --git a/install.el b/install.el
@@ -191,50 +191,6 @@
   (install-detect-elisp-directory))
 
 
-;;; @ for XEmacs package system
-;;;
-
-(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)))))
-
-
-;;; @ Other Utilities
-;;;
-
-(defun install-just-print-p ()
-  (let ((flag (getenv "MAKEFLAGS"))
-	(case-fold-search nil))
-    (princ (format "%s\n" flag))
-    (if flag
-	(string-match "^\\(\\(--[^ ]+ \\)+-\\|[^ =-]\\)*n" flag))))
-
-
 ;;; @ end
 ;;;