Fix a garbage condition

[dhcpcd-ui] / Makefile

diff --git a/Makefile b/Makefile
index 1df019170a3161b3eb8caf6ff9453af855347e2a..537a5b8f83b8b30886f9d673ae209ffe9dcaab88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PROG=          dhcpcd-ui
-VERSION=       0.7.2
+VERSION=       0.7.4
 
 TOPDIR=                .
 include ${TOPDIR}/iconfig.mk
@@ -9,8 +9,9 @@ include ${MKDIR}/subdir.mk
 
 SUBDIR=                src ${MKICONS}
 
-GITREF?=       HEAD
+FOSSILID?=     current
 DISTPREFIX?=   ${PROG}-${VERSION}
+DISTFILEGZ?=   ${DISTPREFIX}.tar.gz
 DISTFILE?=     ${DISTPREFIX}.tar.bz2
 
 CLEANFILES+=   *.tar.bz2
@@ -22,13 +23,12 @@ SNAPDIR=    ${DISTPREFIX}-${SNAP}
 SNAPFILE=      ${SNAPDIR}.tar.bz2
 
 dist:
-       mkdir /tmp/${DISTPREFIX}
-       cp -RPp * /tmp/${DISTPREFIX}
-       (cd /tmp/${DISTPREFIX}; \
-               ./configure; make clean icons; rm config.h config.mk)
-       find /tmp/${DISTPREFIX} -name .gitignore -delete
-       tar -cvjpf ${DISTFILE} -C /tmp ${DISTPREFIX}
+       fossil tarball --name ${DISTPREFIX} ${FOSSILID} /tmp/${DISTFILEGZ}
        rm -rf /tmp/${DISTPREFIX}
+       tar -xzpf /tmp/${DISTFILEGZ} -C /tmp
+       (cd /tmp/${DISTPREFIX}; make icons)
+       tar -cvjpf ${DISTFILE} -C /tmp ${DISTPREFIX}
+       rm -rf /tmp/${DISTPREFIX} /tmp/${DISTFILEGZ}
        ls -l ${DISTFILE}
 
 distclean: