Rework the VERSION mangling in the make dist rule

jonas · May 10, 2012 · 4bfaaa2 · 4bfaaa2
1 parent 66a168d
commit 4bfaaa2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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