Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16554:dad9ad605e56
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>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Thu, 01 Mar 2012 21:21:09 -0700 |
| parents | 3542db992ebe |
| children | 22e269f75dad |
| files | ChangeLog top/maint.mk |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/top/maint.mk +++ b/top/maint.mk @@ -1254,7 +1254,8 @@ --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))