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 (file)
index 2b45716..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-.gitignore     export-ignore
-.gitattributes export-ignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 759b4d8..0000000
--- 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 86c07bf5514beb3c250768e4bd733866d9373a9e..4d831ab49407a96c1a2a5b6a0a5700f522fc638a 100644 (file)
--- 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 bef44ad23bfca8efb5a72f1f541123bebb8908a4..bff6d1e16dd20061faf79d83ad2c3f1052bc46d5 100755 (executable)
--- 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