X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2FMakefile.in;h=ca38edb4a7224c41cb0379f04b4a7829acea833d;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=c631548cbbeee2a931cfe1f7efc16ad973bdc0a6;hpb=722563085c7278c396f713ec3f549c12c5419d61;p=elisp%2Fgnus.git-

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index c631548..ca38edb 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -18,33 +18,37 @@ 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 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; \
@@ -69,9 +73,8 @@ install-package-manifest:
 	$(EMACS_COMP) -f dgnushack-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
+compose-package: gnus-load.el
+	$(EMACS_COMP) -f dgnushack-compose-package
 
 remove-extra-files-in-package:
 	$(EMACS_COMP) -f dgnushack-remove-extra-files-in-package \
@@ -95,13 +98,14 @@ 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
 
 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