maint.mk: use info-gnu@ as the default only for a stable release

* top/maint.mk: Don't default to info-gnu for alpha or beta releases.
For those, just use $(PACKAGE_BUGREPORT), in which case we don't have
to set the Mail-Followup-To header.  Prompted by Reuben Thomas in
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/26488

diff --git a/ChangeLog b/ChangeLog
index b57e17b..e314196 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-06  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: use info-gnu@ as the default only for a stable release
+       * top/maint.mk: Don't default to info-gnu for alpha or beta releases.
+       For those, just use $(PACKAGE_BUGREPORT), in which case we don't have
+       to set the Mail-Followup-To header.  Prompted by Reuben Thomas in
+       http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/26488
+
 2011-05-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        assert-h: new module, which supports C1X-style static_assert

diff --git a/top/maint.mk b/top/maint.mk
index 8727b3f..07efcec 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1123,11 +1123,20 @@ gpg_key_ID ?= \
          | sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig)
 
 translation_project_ ?= coordinator@translationproject.org
-announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT)
-announcement_mail_headers_ ?=                                          \
-To: info-gnu@gnu.org                                                   \
-Cc: $(announcement_Cc_)                                                        \
-Mail-Followup-To: $(PACKAGE_BUGREPORT)
+
+# Make info-gnu the default only for a stable release.
+ifeq ($(RELEASE_TYPE),stable)
+  announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT)
+  announcement_mail_headers_ ?=                                                \
+    To: info-gnu@gnu.org                                               \
+    Cc: $(announcement_Cc_)                                            \
+    Mail-Followup-To: $(PACKAGE_BUGREPORT)
+else
+  announcement_Cc_ ?= $(translation_project_)
+  announcement_mail_headers_ ?=                                                \
+    To: $(PACKAGE_BUGREPORT)                                           \
+    Cc: $(announcement_Cc_)
+endif
 
 announcement: NEWS ChangeLog $(rel-files)
        @$(build_aux)/announce-gen                                      \