# HG changeset patch
# User Jim Meyering <meyering@fb.com>
# Date 1383109304 25200
# Node ID b821a5c78c89d77ec5cfea3c1e4eb280fdf33308
# Parent  e7fa9ea5d6b6142fe2ad74034bea16366069518a
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 -r e7fa9ea5d6b6 -r b821a5c78c89 ChangeLog
--- a/ChangeLog	Wed Oct 30 20:51:39 2013 -0700
+++ b/ChangeLog	Tue Oct 29 22:01:44 2013 -0700
@@ -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 -r e7fa9ea5d6b6 -r b821a5c78c89 top/maint.mk
--- a/top/maint.mk	Wed Oct 30 20:51:39 2013 -0700
+++ b/top/maint.mk	Tue Oct 29 22:01:44 2013 -0700
@@ -1287,12 +1287,13 @@
                     && { 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