diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-12-01 21:54:14 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-12-01 21:54:14 +0100 |
| commit | 8bfdc7fb9c5bfdace7b4d17d6394bf8f18faf405 (patch) | |
| tree | cfff04400c4eb8c471ab59192a5fa54cb4bfa3f2 /maint.mk | |
| parent | 54c6758e1ee7286ca1ad3a04fa207d18a23cfc24 (diff) | |
New upstream version 1.2.0~rc2
Diffstat (limited to 'maint.mk')
| -rw-r--r-- | maint.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1283,15 +1283,17 @@ vc-diff-check: rel-files = $(DIST_ARCHIVES) gnulib_dir ?= $(srcdir)/gnulib -gnulib-version = $$(cd $(gnulib_dir) && git rev-parse --short HEAD) +gnulib-version = $$(cd $(gnulib_dir) \ + && { git describe || git rev-parse --short=10 HEAD; } ) bootstrap-tools ?= autoconf,automake,gnulib +gpgv = $$(gpgv2 --version >/dev/null && echo gpgv2 || echo gpgv) # If it's not already specified, derive the GPG key ID from # the signed tag we've just applied to mark this release. gpg_key_ID ?= \ $$(cd $(srcdir) \ && git cat-file tag v$(VERSION) \ - | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \ + | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null \ | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}') translation_project_ ?= coordinator@translationproject.org |