+2001-01-18 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * lisp/gnus-vers.el (gnus-revision-number): Increment to 01.
+
+2001-01-17 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * lisp/dgnushack.el (dgnushack-make-autoloads): Do nothing if the
+ files for autoloads already exist.
+ (dgnushack-unexporting-files): More useful message.
+
+ * lisp/Makefile.in (install): Call `clever' before installing.
+ (install-lisp): Remove.
+ (clever): Check for whether the all elc files should be recompiled.
+
+ * Makefile.in (xclever): New target.
+ (install-package-lisp): Replace `install-lisp' with `instal'.
+ (install-package-ja): Replace `xlick' with `xclever'.
+ (install-package): Ditto.
+
+2001-01-17 KOSEKI Yoshinori <kose@wizard.tamra.co.jp>
+
+ * Makefile.in: Unset `PWD' for Meadow/NTEmacs.
+
2001-01-15 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/nnheader.el: Require `pces', `poem' and `std11' to reduce
PACKAGEDIR = @PACKAGEDIR@
GNUS_PRODUCT_NAME = @GNUS_PRODUCT_NAME@
+# It may be needed for Meadow/NTEmacs when sh.exe is used for SHELL.
+# Because Meadow/NTEmacs will get the value of the current-directory from
+# the environment variable PWD, but sh.exe will not take care of it even
+# if the current-directory has changed. So we should invalidate it.
+PWD=
+
# It will be used to look for the XEmacs package path if this file is
# mis-configured (e.g. configured for FSFmacs).
EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-ja
## Rule for XEmacs package.
-install-package: xlick compose-package remove-extra-files-in-package \
+install-package: xclever compose-package remove-extra-files-in-package \
install-package-lisp \
install-package-info install-package-manifest
-install-package-ja: xlick compose-package remove-extra-files-in-package \
+install-package-ja: xclever compose-package remove-extra-files-in-package \
install-package-lisp \
install-package-info install-package-info-ja \
install-package-manifest
fi; \
echo "cd lisp && $(MAKE) EMACS=$(XEMACS)" \
"lispdir=$$package_dir""/lisp/$(GNUS_PRODUCT_NAME)" \
- "install-lisp"; \
+ "install"; \
cd lisp && $(MAKE) EMACS="$(XEMACS)" \
lispdir="$$package_dir""/lisp/$(GNUS_PRODUCT_NAME)" \
- install-lisp
+ install
install-package-info:
@if test x$(PACKAGEDIR) = x; then \
cd lisp && $(MAKE) EMACS="$(XEMACS)" compose-package
##
+xclever:
+ cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" clever
+
xlick:
cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all
# The "clever" rule is unsafe, since redefined macros are loaded from
# .elc files, and not the .el file.
clever some:
+ @if test -f $(srcdir)/gnus.elc; then \
+ echo \
+ "checking for whether the all elc files should be recompiled..."; \
+ RM_ELC=nil; \
+ if test `$(EMACS) -batch -q -no-site-file \
+ -eval "(princ (format \"%s\" (featurep (quote xemacs))))" \
+ 2>/dev/null` = t; then \
+ test ! -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
+ else \
+ test -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
+ fi; \
+ if test $$RM_ELC = t; then \
+ echo " => yes; rm -f *.elc auto-autoloads.el custom-load.el"; \
+ rm -f *.elc auto-autoloads.el custom-load.el; \
+ else \
+ echo " => unnecessary"; \
+ fi; \
+ fi
W3DIR=$(W3DIR) lispdir=$(lispdir) \
srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
-install: clever install-lisp
-
-install-lisp:
+install: clever
$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
@for p in `$(EXPORTING_FILES)`; do \
echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
(defconst dgnushack-unexporting-files
(append '("dgnushack.el" "dgnuspath.el" "lpath.el" "ptexinfmt.el")
- (unless (or (condition-case nil
+ (unless (or (condition-case code
(require 'w3-forms)
- (error nil))
+ (error
+ (message "No w3: %s %s retrying..." code
+ (locate-library "w3-forms"))
+ nil))
;; Maybe mis-configured Makefile is used (e.g.
;; configured for FSFmacs but XEmacs is running).
(let ((lp (delete dgnushack-w3-dir
(copy-sequence load-path))))
- (when (condition-case nil
- (let ((load-path lp))
- (require 'w3-forms))
- (error nil))
- ;; If success, fix `load-path' for compiling.
- (setq load-path lp))))
+ (if (let ((load-path lp))
+ (condition-case nil
+ (require 'w3-forms)
+ (error nil)))
+ ;; If success, fix `load-path' for compiling.
+ (progn
+ (setq load-path lp)
+ (message " => fixed; W3DIR=%s"
+ (file-name-directory
+ (locate-library "w3-forms")))
+ t)
+ (message " => ignored")
+ nil)))
'("nnweb.el" "nnlistserv.el" "nnultimate.el"
"nnslashdot.el" "nnwarchive.el" "webmail.el"
"nnwfm.el"))
(defun dgnushack-make-autoloads ()
"Make auto-autoloads.el, custom-load.el and then compile them."
- (let (make-backup-files)
- (message "Updating autoloads for directory %s..." default-directory)
- (let ((generated-autoload-file "auto-autoloads.el")
- (si:message (symbol-function 'message))
- noninteractive)
- (defun message (fmt &rest args)
- (cond ((and (string-equal "Generating autoloads for %s..." fmt)
- (file-exists-p (file-name-nondirectory (car args))))
- (funcall si:message fmt (file-name-nondirectory (car args))))
- ((string-equal "No autoloads found in %s" fmt))
- ((string-equal "Generating autoloads for %s...done" fmt))
- (t (apply si:message fmt args))))
- (unwind-protect
- (update-autoloads-from-directory default-directory)
- (fset 'message si:message)))
- (byte-compile-file "auto-autoloads.el")
- (with-temp-buffer
- (let ((standard-output (current-buffer)))
- (Custom-make-dependencies "."))
- (message "%s" (buffer-string)))
- (require 'cus-load)
- (byte-compile-file "custom-load.el")))
+ (let ((auto-autoloads (expand-file-name "auto-autoloads.el" srcdir))
+ (custom-load (expand-file-name "custom-load.el" srcdir)))
+ (unless (and (file-exists-p auto-autoloads)
+ (file-exists-p (concat auto-autoloads "c"))
+ (file-newer-than-file-p (concat auto-autoloads "c")
+ auto-autoloads)
+ (file-exists-p custom-load)
+ (file-exists-p (concat custom-load "c"))
+ (file-newer-than-file-p (concat custom-load "c")
+ custom-load))
+ (let (make-backup-files)
+ (message "Updating autoloads for directory %s..." default-directory)
+ (let ((generated-autoload-file auto-autoloads)
+ (si:message (symbol-function 'message))
+ noninteractive)
+ (defun message (fmt &rest args)
+ (cond ((and (string-equal "Generating autoloads for %s..." fmt)
+ (file-exists-p (file-name-nondirectory (car args))))
+ (funcall si:message
+ fmt (file-name-nondirectory (car args))))
+ ((string-equal "No autoloads found in %s" fmt))
+ ((string-equal "Generating autoloads for %s...done" fmt))
+ (t (apply si:message fmt args))))
+ (unwind-protect
+ (update-autoloads-from-directory default-directory)
+ (fset 'message si:message)))
+ (byte-compile-file auto-autoloads)
+ (with-temp-buffer
+ (let ((standard-output (current-buffer)))
+ (Custom-make-dependencies "."))
+ (message "%s" (buffer-string)))
+ (require 'cus-load)
+ (byte-compile-file custom-load)))))
(defun dgnushack-remove-extra-files-in-package ()
"Remove extra files in the lisp directory of the XEmacs package."