From: Eric Blake <eblake@redhat.com>
Date: Fri, 2 Mar 2012 04:21:09 +0000 (-0700)
Subject: maint.mk: allow announcement for non-gnulib project
X-Git-Tag: v0.1~972
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=d5612c714c87555f1059d71d347e20271dced322

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 <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index fc1514464..c3490a0f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01  Eric Blake  <eblake@redhat.com>
+
+	maint.mk: allow announcement for non-gnulib project
+	* maint.mk (announcement): Skip gnulib version if not used.
+
 2012-03-01  Jim Meyering  <meyering@redhat.com>
 
 	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))