From: Jim Meyering <meyering@fb.com>
Date: Wed, 30 Oct 2013 05:01:44 +0000 (-0700)
Subject: maint.mk: prefer gpgv2 over gpgv
X-Git-Tag: snapshot-start~46
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=20f47607a28df95cd7594b1a1f982a1d8563d8d2

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.
---

diff --git a/ChangeLog b/ChangeLog
index 3e96abc9f..e2fb9712d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-29  Jim Meyering  <meyering@fb.com>
+
+	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.
+
 2013-10-30  Paul Eggert  <eggert@cs.ucla.edu>
 
 	isnan: port to VAX
diff --git a/top/maint.mk b/top/maint.mk
index 8cb58f841..9c02ed4e3 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