From: Roy Marples <roy@marples.name>
Date: Fri, 3 Jan 2014 17:16:12 +0000 (+0000)
Subject: Change configure to detect fossil for debugging.
X-Git-Tag: v6.2.0~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3c55f23df5dc674e14f9df1c3b1ec26b1185c77;p=thirdparty%2Fdhcpcd.git

Change configure to detect fossil for debugging.
Make dist now exports the current fossil checkin.
Remove old .git files.
---

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 2b45716e..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-.gitignore	export-ignore
-.gitattributes	export-ignore
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 759b4d88..00000000
--- a/.gitignore
+++ /dev/null
@@ -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
diff --git a/Makefile b/Makefile
index 86c07bf5..4d831ab4 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,10 @@ _VERSION_SH=	sed -n 's/\#define VERSION[[:space:]]*"\(.*\)".*/\1/p' defs.h
 _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 @@ distclean: clean
 	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}
diff --git a/configure b/configure
index bef44ad2..bff6d1e1 100755
--- a/configure
+++ b/configure
@@ -296,8 +296,8 @@ if [ -n "$DEBUG" -a "$DEBUG" != no -a "$DEBUG" != false ]; then
 	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