New subject: [arch-projects] [mkinitcpio] [PATCH] generate VERSION only for the tarball

10 Jul 2011

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 Makefile |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 72efab1..18df47f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@ DIRS = \
 	/usr/share/man/man5
 
 DIST_EXTRA = \
-	mkinitcpio.5 \
-	VERSION
+	mkinitcpio.5
 
 all: doc
 
@@ -47,9 +46,6 @@ install: all
 	install -m644 mkinitcpio.5 ${DESTDIR}/usr/share/man/man5/mkinitcpio.5
 	install -m644 bash-completion ${DESTDIR}/etc/bash_completion.d/mkinitcpio
 
-write-ver:
-	git describe > VERSION
-
 doc: mkinitcpio.5
 mkinitcpio.5: mkinitcpio.5.txt Makefile
 	a2x -d manpage \
@@ -60,16 +56,16 @@ mkinitcpio.5: mkinitcpio.5.txt Makefile
 
 clean:
 	${RM} -r build mkinitcpio-${VERSION}
-	${RM} mkinitcpio-${VERSION}.tar.gz mkinitcpio.5 mkinitcpio.5.gz VERSION
+	${RM} mkinitcpio-${VERSION}.tar.gz mkinitcpio.5 mkinitcpio.5.gz
 
 tarball: dist
-dist: clean write-ver doc
+dist: clean doc
 	git archive --prefix=mkinitcpio-${VERSION}/ -o mkinitcpio-${VERSION}.tar HEAD
 	mkdir mkinitcpio-${VERSION}; \
 		cp -t mkinitcpio-${VERSION} ${DIST_EXTRA}; \
+		echo ${VERSION} > mkinitcpio-${VERSION}/VERSION; \
 		tar uf mkinitcpio-${VERSION}.tar mkinitcpio-${VERSION}; \
 		${RM} -r mkinitcpio-${VERSION}
 	gzip -9 mkinitcpio-${VERSION}.tar
-	${RM} VERSION
 
-.PHONY: clean dist install tarball write-ver
+.PHONY: clean dist install tarball
-- 
1.7.6

    

Florian Pritz