From: David Bremner <david@tethera.net>
Date: Sat, 3 May 2014 23:11:35 +0000 (+0900)
Subject: build: use UPSTREAM_TAG and not VERSION to generate tarball
X-Git-Tag: 0.18_rc1^0
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=55354534953fd631ae1f51cf0f46732f00fde9c2

build: use UPSTREAM_TAG and not VERSION to generate tarball

The latter can have "~" in it, which is not legal for a git tag.
---

diff --git a/Makefile.local b/Makefile.local
index 877a9790..086b5a11 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -80,8 +80,8 @@ version.stamp: $(srcdir)/version
 	echo $(VERSION) > $@
 
 $(TAR_FILE):
-	if git tag -v $(VERSION) >/dev/null 2>&1; then \
-           ref=$(VERSION); \
+	if git tag -v $(UPSTREAM_TAG) >/dev/null 2>&1; then \
+           ref=$(UPSTREAM_TAG); \
         else \
            ref="HEAD" ; \
 	   echo "Warning: No signed tag for $(VERSION)"; \