diff options
| author | Jim Meyering <meyering@fb.com> | 2013-10-29 22:01:44 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2013-10-31 07:22:29 -0700 |
| commit | 20f47607a28df95cd7594b1a1f982a1d8563d8d2 (patch) | |
| tree | b46b3a443ea255c6d4759113f3c7fe075000e2db /top | |
| parent | b0b422614cc9fda29e9675dcc6f2a377b3d517a8 (diff) | |
| download | gnulib-20f47607a28df95cd7594b1a1f982a1d8563d8d2.tar.gz | |
maint.mk: prefer gpgv2 over gpgv
* top/maint.mk (gpgv): Use gpgv2 if present, else gpgv.
(gpg_key_ID): Use $(gpgv), rather than hard-coding "gpgv".
Reported by Gary Vaughan.
Diffstat (limited to 'top')
| -rw-r--r-- | top/maint.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/top/maint.mk b/top/maint.mk index 8cb58f8415..9c02ed4e35 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1287,12 +1287,13 @@ 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 |