* gnus-vers.el (gnus-revision-number): Increment to 05.

[elisp/gnus.git-] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index c631548..0bac6c5 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -18,6 +18,10 @@ EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir)
 GNUS_PRODUCT_NAME = @GNUS_PRODUCT_NAME@
 EXPORTING_FILES = $(EMACS_COMP) -f dgnushack-exporting-files 2>/dev/null
 
+# We should never use `COMMAND && ...' form, use `if COMMAND then ...'
+# form instead.  Because, as far as we know, FreeBSD's native make will
+# be discontinued if COMMAND returns a non-zero exit status.
+
 all total: clean-some gnus-load.elc
        $(EMACS_COMP) -f dgnushack-compile
 
@@ -32,19 +36,19 @@ warn: clean-some gnus-load.elc
 clever some: gnus-load.elc
        @if test -f $(srcdir)/gnus.elc; then \
          echo \
-           "checking for whether the all elc files should be recompiled..."; \
+           "checking 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))))" \
+               -eval '(prin1 (featurep (quote xemacs)))' \
                2>/dev/null` = t; then \
-           test ! -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
+           if test ! -f $(srcdir)/gnus-xmas.elc; then RM_ELC=t; fi; \
          else \
-           test -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
+           if test -f $(srcdir)/gnus-xmas.elc; then RM_ELC=t; fi; \
          fi; \
          if test $$RM_ELC = t; then \
            echo " => maybe yes;" \
-               "rm -f *.elc auto-autoloads.el"; \
-           rm -f *.elc auto-autoloads.el; \
+               "rm -f *.elc auto-autoloads.el custom-load.el"; \
+           rm -f *.elc auto-autoloads.el custom-load.el; \
          else \
            echo " => maybe unnecessary"; \
          fi; \
@@ -70,8 +74,7 @@ install-package-manifest:
                $(PACKAGEDIR) $(GNUS_PRODUCT_NAME)
 
 compose-package: gnus-load.elc
-       mv gnus-load.el auto-autoloads.el; \
-       mv gnus-load.elc auto-autoloads.elc
+       $(EMACS_COMP) -f dgnushack-compose-package
 
 remove-extra-files-in-package:
        $(EMACS_COMP) -f dgnushack-remove-extra-files-in-package \
@@ -101,7 +104,8 @@ gnus-load.elc:
        $(EMACS_COMP) -f dgnushack-make-load
 
 clean:
-       rm -f *.orig *.rej *.elc *~ auto-autoloads.el gnus-load.el
+       rm -f *.orig *.rej *.elc *~ \
+               auto-autoloads.el custom-load.el gnus-load.el dgnuskwds.el
 
 distclean: clean
        rm -f Makefile dgnuspath.el