]> Savannah Git Hosting - gnulib.git/commitdiff
maintainer-makefile: Respect cfg.mk setting announcement_Cc_, reverting most of the...
authorSimon Josefsson <simon@josefsson.org>
Wed, 28 Jul 2021 08:37:57 +0000 (10:37 +0200)
committerSimon Josefsson <simon@josefsson.org>
Wed, 28 Jul 2021 08:47:40 +0000 (10:47 +0200)
* 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.

ChangeLog
top/maint.mk

index 93103675503e5e64fa43030643460973461e3dea..d8a9bb1b87f46dc20064abdc9aa2ab13520718c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
index 533591ff9a55f2387a72fc380f513f32ab975ea6..044254bdcb1a42b038e79dd903115afcc04f440e 100644 (file)
@@ -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