From 4bfaaa2bc10912d91aef9a1db2a838eeb3f88de6 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 10 May 2012 08:42:59 -0400
Subject: [PATCH] Rework the VERSION mangling in the make dist rule

---
 Makefile           | 6 +++---
 contrib/release.sh | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a88be88..649bcab 100644
--- a/Makefile
+++ b/Makefile
@@ -132,10 +132,10 @@ strip: $(PROGS)
 
 dist: configure tig.spec
 	@mkdir -p $(TARNAME) && \
-	cp tig.spec configure config.h.in aclocal.m4 $(TARNAME) && \
-	echo $(VERSION) > $(TARNAME)/VERSION
+	cp Makefile tig.spec configure config.h.in aclocal.m4 $(TARNAME) && \
+	sed -i "s/VERSION\s=\s[0-9]\+[.][0-9]\+/VERSION	= $(VERSION)/" $(TARNAME)/Makefile
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | \
-	tar --delete $(TARNAME)/VERSION > $(TARNAME).tar && \
+	tar --delete $(TARNAME)/Makefile > $(TARNAME).tar && \
 	tar rf $(TARNAME).tar `find $(TARNAME)/*` && \
 	gzip -f -9 $(TARNAME).tar && \
 	md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
diff --git a/contrib/release.sh b/contrib/release.sh
index ab77bf3..f72fa46 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -33,7 +33,6 @@ if test -n "$VERSION"; then
 		git checkout master
 
 	# Update files which should reference the version.
-	echo "$VERSION" > VERSION
 	sed -i "s/VERSION\s=\s[0-9]\+[.][0-9]\+/VERSION	= $VERSION/" Makefile	
 	perl -pi -e 's/^tig master.*/@@TITLE@@/ms' NEWS
 	perl -pi -e "s/^@@TITLE@@.*/$TITLE/" NEWS
-- 
2.11.4.GIT