From 563046ab9b3208b4b6df650451bb888fbbffc073 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Tue, 10 Dec 2024 09:52:37 +0100 Subject: [PATCH] maintainer-makefile: Pass on $(announce_gen_args) to announce-gen. * top/maint.mk (announce_gen_args): New variable, for cfg.mk use. (announcement): Use it. --- ChangeLog | 6 ++++++ top/maint.mk | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 54546f10c9..09ac44d1c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-10 Simon Josefsson + + maintainer-makefile: Pass on $(announce_gen_args) to announce-gen. + * top/maint.mk (announce_gen_args): New variable, for cfg.mk use. + (announcement): Use it. + 2024-12-09 Bruno Haible xstrtol-error: Use the translation domain "gnulib". diff --git a/top/maint.mk b/top/maint.mk index a6f130d3d6..b2baa02edf 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1550,6 +1550,8 @@ announcement_mail_headers_alpha = \ announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) announcement_mail_headers_beta = $(announcement_mail_headers_alpha) +announce_gen_args ?= + announcement_Cc_ ?= $(announcement_Cc_$(release-type)) announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) announcement: NEWS ChangeLog $(rel-files) @@ -1571,7 +1573,8 @@ announcement: NEWS ChangeLog $(rel-files) --bootstrap-tools=$(bootstrap-tools) \ $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ echo --gnulib-version=$(gnulib-version);; esac) \ - $(addprefix --url-dir=, $(url_dir_list)) + $(addprefix --url-dir=, $(url_dir_list)) \ + $(announce_gen_args) .PHONY: release-commit release-commit: -- 2.39.5