summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2019-06-26 23:42:22 +0100
committerRoy Marples <roy@marples.name>2019-06-26 23:42:22 +0100
commitfbc6e057f29ee7c85a5de4131ab0f0684af665ca (patch)
treeebd5eab13f3173798b67658cfe1564aaac38a27f
parentd1890f0a7f4e374d51b24187dd69cf9a589119d7 (diff)
Fix making dist files.
-rw-r--r--Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 94fa5cc..3ddc9c2 100644
--- 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}