From d5612c714c87555f1059d71d347e20271dced322 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 1 Mar 2012 21:21:09 -0700 Subject: [PATCH] maint.mk: allow announcement for non-gnulib project Currently, autoconf does not use a gnulib submodule; this tripped up the 'make beta' with: announce-gen: when specifying gnulib as a tool, you must also specify --gnulib-version=V, where V is the result of running git describe in the gnulib source directory. Try 'announce-gen --help' for more information. * maint.mk (announcement): Skip gnulib version if not used. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ top/maint.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc1514464..c3490a0f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-03-01 Eric Blake + + maint.mk: allow announcement for non-gnulib project + * maint.mk (announcement): Skip gnulib version if not used. + 2012-03-01 Jim Meyering maint.mk: avoid spurious failure of _sc_search_regexp-using tests diff --git a/top/maint.mk b/top/maint.mk index 839f7b2c3..4cbd5f400 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1254,7 +1254,8 @@ announcement: NEWS ChangeLog $(rel-files) --gpg-key-id=$(gpg_key_ID) \ --news=$(srcdir)/NEWS \ --bootstrap-tools=$(bootstrap-tools) \ - --gnulib-version=$(gnulib-version) \ + $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ + echo --gnulib-version=$(gnulib-version);; esac) \ --no-print-checksums \ $(addprefix --url-dir=, $(url_dir_list)) -- 2.11.0