summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-03-24 15:55:08 +0100
committerDave Reisner <dreisner@archlinux.org>2012-03-24 20:43:38 +0100
commit69a93873e124fed7fa4d6aaf7f76090f81433954 (patch)
tree44f348ac3c7b91bc6bd8ed9c1443c9d089802e53
parent2c7c8f295a0871f57bb9324d1bd9cd385a45d540 (diff)
downloadmkinitcpio-69a93873e124fed7fa4d6aaf7f76090f81433954.tar.gz
mkinitcpio-69a93873e124fed7fa4d6aaf7f76090f81433954.tar.xz
Makefile: simplify 'make dist' target0.8.5
- Use git-ls-files and bsdtar to create the archive rather than using git-archive and an temporary directory. - Remove the tarball target. 'dist' is more common. - Remove the 'clean' dependency from dist. Our dependencies are sufficient higher up that touching the Makefile or the asciidoc input will trigger a doc rebuild on changes. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--Makefile15
1 files changed, 6 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 9eac07e..46b0b09 100644
--- a/Makefile
+++ b/Makefile
@@ -57,15 +57,12 @@ clean:
${RM} -r build mkinitcpio-${VERSION}
${RM} mkinitcpio-${VERSION}.tar.gz mkinitcpio.8 mkinitcpio.8.gz
-tarball: dist
-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
+dist: doc
+ echo ${VERSION} > VERSION
+ git ls-files -z | xargs -0 \
+ bsdtar -czf mkinitcpio-${VERSION}.tar.gz -s ,^,mkinitcpio-${VERSION}/, VERSION ${DIST_EXTRA}
+ ${RM} VERSION
+
version:
@echo ${VERSION}