From: David Bremner <bremner@debian.org>
Date: Sun, 3 Jul 2011 20:28:47 +0000 (-0300)
Subject: build-system: use signed tag to make tar file, if available.
X-Git-Tag: 0.6.1~4
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=9b0dfd11c5d4af6dc4cd2b79f33e0d6c460d414e

build-system: use signed tag to make tar file, if available.

This as the advantage that "make VERSION=n.m dist" will work correctly
even if the wrong branch happens to be checked out.
---

diff --git a/Makefile.local b/Makefile.local
index 990f8204..7fc68163 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -61,7 +61,13 @@ endif
 endif
 
 $(TAR_FILE):
-	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp
+	if git tag -v $(VERSION) >/dev/null 2>&1; then \
+           ref=$(VERSION); \
+        else \
+           ref="HEAD" ; \
+	   echo "Warning: No signed tag for $(VERSION)"; \
+	fi ; \
+	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
 	echo $(VERSION) > version.tmp
 	tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_  --transform 's_.tmp$$__' version.tmp
 	rm version.tmp