* message.el: Require `base64' before `canlock-om' to avoid damage to define

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

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 424ad15..ca38edb 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -18,18 +18,22 @@ 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
 
-all total: clean-some gnus-load.elc
+# 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.el
        $(EMACS_COMP) -f dgnushack-compile
 
 clean-some:
        rm -f *.elc gnus-load.el
 
-warn: clean-some gnus-load.elc
+warn: clean-some gnus-load.el
        $(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
 # The "clever" rule is unsafe, since redefined macros are loaded from
 # .elc files, and not the .el file.
-clever some: gnus-load.elc
+clever some l: gnus-load.el
        @if test -f $(srcdir)/gnus.elc; then \
          echo \
            "checking whether the all elc files should be recompiled..."; \
@@ -37,9 +41,9 @@ clever some: gnus-load.elc
          if test `$(EMACS) -batch -q -no-site-file \
                -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;" \
@@ -69,7 +73,7 @@ install-package-manifest:
        $(EMACS_COMP) -f dgnushack-install-package-manifest \
                $(PACKAGEDIR) $(GNUS_PRODUCT_NAME)
 
-compose-package: gnus-load.elc
+compose-package: gnus-load.el
        $(EMACS_COMP) -f dgnushack-compose-package
 
 remove-extra-files-in-package:
@@ -94,7 +98,7 @@ separately:
 pot:
        xpot -drgnus -r`cat ./version` *.el > rgnus.pot
 
-gnus-load.elc:
+gnus-load.el:
        $(EMACS_COMP) -f dgnushack-make-cus-load $(srcdir)
        $(EMACS_COMP) -f dgnushack-make-auto-load $(srcdir)
        $(EMACS_COMP) -f dgnushack-make-load