Applied a patch from KITAGAWA Takurou <i30x1641@ip.media.kyoto-u.ac.jp>

* lisp/Makefile.in (clever): Use `if test... then' instead of `test... &&'.

diff --git a/ChangeLog b/ChangeLog
index 833bdf1..c6a1c2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-06  KITAGAWA Takurou  <i30x1641@ip.media.kyoto-u.ac.jp>
+
+       * lisp/Makefile.in (clever): Use `if test... then' instead of
+       `test... &&'.
+
 2001-07-06  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/Makefile.in (clever): Change the quoting style for the

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 424ad15..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
 
@@ -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;" \