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>

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}