Fix making dist files.
authorRoy Marples <roy@marples.name>
Wed, 26 Jun 2019 22:42:22 +0000 (23:42 +0100)
committerRoy Marples <roy@marples.name>
Wed, 26 Jun 2019 22:42:22 +0000 (23:42 +0100)
Makefile

index 94fa5cc860a6b365076abb93074c9f4b41fe1da1..3ddc9c26827523de2e3fe310892eb2dba4f51699 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,10 @@ include ${MKDIR}/subdir.mk
 
 SUBDIR=                src ${MKICONS}
 
-FOSSILID?=     current
+GITREF?=       HEAD
 DISTPREFIX?=   ${PROG}-${VERSION}
-DISTFILEGZ?=   ${DISTPREFIX}.tar.gz
-DISTFILE?=     ${DISTPREFIX}.tar.xz
+DISTFILETAR?=  ${DISTPREFIX}.tar
+DISTFILE?=     ${DISTFILETAR}.xz
 DISTINFO=      ${DISTFILE}.distinfo
 DISTINFOSIGN=  ${DISTINFO}.asc
 CKSUM?=                cksum -a SHA256
@@ -27,13 +27,12 @@ SNAPDIR=    ${DISTPREFIX}-${SNAP}
 SNAPFILE=      ${SNAPDIR}.tar.xz
 
 dist:
-       fossil tarball --name ${DISTPREFIX} ${FOSSILID} /tmp/${DISTFILEGZ}
-       rm -rf /tmp/${DISTPREFIX}
-       tar -xzpf /tmp/${DISTFILEGZ} -C /tmp
+       git archive --prefix=${DISTPREFIX}/ -o /tmp/${DISTFILETAR} ${GITREF}
+       tar -xpf /tmp/${DISTFILETAR} -C /tmp
        (cd /tmp/${DISTPREFIX}; make icons)
        rm -rf /tmp/${DISTPREFIX}/doc
        tar -cvJpf ${DISTFILE} -C /tmp ${DISTPREFIX}
-       rm -rf /tmp/${DISTPREFIX} /tmp/${DISTFILEGZ}
+       rm -rf /tmp/${DISTPREFIX} /tmp/${DISTFILETAR}
 
 distinfo: dist
        rm -f ${DISTINFO} ${DISTINFOSIGN}