From f5599c804c70b18a1fa717b3c42a520a6649dbf2 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 28 Jul 2012 12:40:53 +0200 Subject: [PATCH] maint.mk: absolute VPATH build fix * top/maint.mk (gpg_key_ID): Help git find .git when, for instance, $(srcdir) is not a parent of $(builddir). --- ChangeLog | 6 ++++++ top/maint.mk | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa6941880..500006ef4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-07-29 Akim Demaille + + maint.mk: absolute VPATH build fix + * top/maint.mk (gpg_key_ID): Help git find .git when, for instance, + $(srcdir) is not a parent of $(builddir). + 2012-07-28 John Darrington clean-temp: Fix memory leak. diff --git a/top/maint.mk b/top/maint.mk index baff0e989..2af938e6a 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1256,10 +1256,11 @@ bootstrap-tools ?= autoconf,automake,gnulib # 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 ?= \ - $$(git cat-file tag v$(VERSION) \ - | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \ - | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}') +gpg_key_ID ?= \ + $$(cd $(srcdir) \ + && git cat-file tag v$(VERSION) \ + | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \ + | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}') translation_project_ ?= coordinator@translationproject.org -- 2.11.0