Commit Diff


commit - 2a7970ee3f0bab07a4d8af817635e4130b543e38
commit + 1f0d29ac8f8d296fdc27ae5f8aea8d140d667b13
blob - 3ca4bf8265a6494b2c25880e5adecaac5538e9c0
blob + 7f47250d5e6c2b46349d7e89bc7e140e6e7b1e3f
--- Makefile
+++ Makefile
@@ -1,19 +1,17 @@
 VERSION=	0.1
 PROG=		plass
+DISTNAME=	${PROG}-${VERSION}
 MAN=		plass.1
-EXTRA=		README.md Makefile plass-dist.txt
+EXTRA=		README.md Makefile
 
 INSTALL=	install
+INSTALL_DATA=	${INSTALL} -m 0644
 INSTALL_MAN=	${INSTALL} -m 0444
 INSTALL_PROGRAM=${INSTALL} -m 0555
 
 PREFIX=		/usr/local
 MANDIR=		${PREFIX}/man
 
-# for dist
-TMPDIR=		/tmp
-STAGEDIR=	${TMPDIR}/plass-${VERSION}
-
 .PHONY: all dist install-local install lint
 
 all:
@@ -28,12 +26,14 @@ install:
 lint:
 	man -Tlint -l ${MAN}
 
-dist:
-	mkdir ${STAGEDIR}
-	pax -rw ${PROG} ${MAN} ${EXTRA} ${STAGEDIR}
-	tar -C ${TMPDIR} -vzcf plass-${VERSION}.tar.gz plass-${VERSION} | \
-		sed -E 's,^plass-${VERSION}/?,,' | \
-		sort -u > plass-dist.txt.new
-	rm -rf ${STAGEDIR}
-	diff -u plass-dist.txt{,.new}
-	rm plass-dist.txt.new
+dist: ${DISTNAME}.sha256
+
+${DISTNAME}.sha256: ${DISTNAME}.tar.gz
+	sha256 ${DISTNAME}.tar.gz > $@
+
+${DISTNAME}.tar.gz: ${PROG} ${MAN} ${EXTRA}
+	mkdir -p .dist/${DISTNAME}
+	${INSTALL_DATA} ${MAN} ${EXTRA} .dist/${DISTNAME}
+	${INSTALL_PROGRAM} ${PROG} .dist/${DISTNAME}
+	cd .dist && tar zcf ../$@ ${DISTNAME}
+	rm -rf .dist