summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--top/maint.mk10
2 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9310367550..d8a9bb1b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2021-07-28 Simon Josefsson <simon@josefsson.org>
+ maintainer-makefile: Respect cfg.mk setting announcement_Cc_,
+ reverting most of the previous patch.
+ * top/maint.mk (announcement_mail_Cc_stable): Rename back to
+ announcement_Cc_stable.
+ (announcement_Cc_alpha): Rename back to
+ announcement_mail_Cc_alpha.
+ (announcement_Cc_): Renamed from announcement_mail_Cc_.
+ (announcement_mail_headers_stable)
+ (announcement_mail_headers_alpha): Use announcement_Cc_ again.
+
+2021-07-28 Simon Josefsson <simon@josefsson.org>
+
maintainer-makefile: Fix announcement mail CC's.
* top/maint.mk (announcement_Cc_stable): Rename to
announcement_mail_Cc_stable.
diff --git a/top/maint.mk b/top/maint.mk
index 533591ff9a..044254bdcb 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1395,21 +1395,21 @@ gpg_key_ID ?= \
translation_project_ ?= coordinator@translationproject.org
# Make info-gnu the default only for a stable release.
-announcement_mail_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
announcement_mail_headers_stable = \
To: info-gnu@gnu.org \
- Cc: $(announcement_mail_Cc_) \
+ Cc: $(announcement_Cc_) \
Mail-Followup-To: $(PACKAGE_BUGREPORT)
-announcement_mail_Cc_alpha = $(translation_project_)
+announcement_Cc_alpha = $(translation_project_)
announcement_mail_headers_alpha = \
To: $(PACKAGE_BUGREPORT) \
- Cc: $(announcement_mail_Cc_)
+ Cc: $(announcement_Cc_)
announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_Cc_ ?= $(announcement_Cc_$(release-type))
announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type))
announcement: NEWS ChangeLog $(rel-files)
# Not $(AM_V_GEN) since the output of this command serves as