Fix make dist to export the fossil trunk, not whats on the disk.
authorRoy Marples <roy@marples.name>
Mon, 6 Oct 2014 18:55:07 +0000 (18:55 +0000)
committerRoy Marples <roy@marples.name>
Mon, 6 Oct 2014 18:55:07 +0000 (18:55 +0000)
Makefile
README

index ab397e019a4e7d9feb6662d2ab278591e4c37a73..d4a83c2b44ede0393f742e8e7f294b2315672dc1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/README b/README
index a036a4ed278193147a01fe76a3c74e064d305240..98623c6c8789e3e0ebfdab2a8a0e9aef3171ea9d 100644 (file)
--- a/README
+++ b/README
@@ -18,6 +18,3 @@ Switches to control building of various parts:
 For each --with there is a --without and for each --enable a --disable.
 If each part is not specified then the configure will test the system
 for the needed libraries to build and install it.
-
-When creating a distribution tarball, the host system requires
-the libraries to build all the components.