Mercurial > hg > dhcpcd
changeset 2206:2496e7e94229 draft
Change configure to detect fossil for debugging.
Make dist now exports the current fossil checkin.
Remove old .git files.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Fri, 03 Jan 2014 17:16:12 +0000 |
| parents | cc598e8e72b0 |
| children | 467a20d19019 |
| files | .gitattributes .gitignore Makefile configure |
| diffstat | 4 files changed, 8 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitattributes Fri Dec 13 14:54:14 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -.gitignore export-ignore -.gitattributes export-ignore
--- a/.gitignore Fri Dec 13 14:54:14 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -.depend -*.o -*.So -*.so -*.bz2 -config.h -config.mk -dhcpcd -dhcpcd.conf.5 -dhcpcd.core -dhcpcd.8 -dhcpcd-embedded.c -dhcpcd-embedded.h -dhcpcd-run-hooks -dhcpcd-run-hooks.8
--- a/Makefile Fri Dec 13 14:54:14 2013 +0000 +++ b/Makefile Fri Jan 03 17:16:12 2014 +0000 @@ -48,8 +48,10 @@ _VERSION!= ${_VERSION_SH} VERSION= ${_VERSION}$(shell ${_VERSION_SH}) -GITREF?= HEAD +FOSSILID?= current + DISTPREFIX?= ${PROG}-${VERSION} +DISTFILEGZ?= ${DISTPREFIX}.tar.gz DISTFILE?= ${DISTPREFIX}.tar.bz2 HOST_SH?= /bin/sh @@ -130,7 +132,9 @@ rm -f .depend config.h config.mk dist: - git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE} + fossil tarball --name ${DISTPREFIX} ${FOSSILID} ${DISTFILEGZ} + gunzip -c ${DISTFILEGZ} | bzip2 >${DISTFILE} + rm ${DISTFILEGZ} import: ${SRCS} rm -rf /tmp/${DISTPREFIX}
--- a/configure Fri Dec 13 14:54:14 2013 +0000 +++ b/configure Fri Jan 03 17:16:12 2014 +0000 @@ -296,8 +296,8 @@ echo "Enabling memory debugging" echo "CPPFLAGS+= -DDEBUG_MEMORY" >>$CONFIG_MK echo "CFLAGS+= -g" >>$CONFIG_MK -elif [ -z "$DEBUG" -a -d .git ]; then - printf "Found git ... " +elif [ -z "$DEBUG" -a -f .fslckout ]; then + printf "Found fossil checkout ... " DEBUG=yes echo "CFLAGS+= -g" >>$CONFIG_MK else