From: Roy Marples <roy@marples.name>
Date: Tue, 14 Jul 2009 21:01:59 +0000 (+0000)
Subject: Fix compile without memory debug
X-Git-Tag: v5.1.0~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cab5f5506f3652567d54bde16db25de1da245487;p=thirdparty%2Fdhcpcd.git

Fix compile without memory debug
Add configure option for --with-hook=ntp
Add debug CFLAGS for git clones
Fix manpage installation
---

diff --git a/Makefile b/Makefile
index 162cfb54..f2177a15 100644
--- a/Makefile
+++ b/Makefile
@@ -79,10 +79,10 @@ _scriptsinstall: ${SCRIPTS}
 	${INSTALL} -m ${BINMODE} ${SCRIPTS} ${DESTDIR}${SCRIPTSDIR}
 
 _maninstall: ${MAN5} ${MAN8}
-	${INSTALL} -d ${DESTDIR}${MANDIR}5
-	${INSTALL} -m ${MANMODE} ${MAN5} ${DESTDIR}${MANDIR}5
-	${INSTALL} -d ${DESTDIR}${MANDIR}8
-	${INSTALL} -m ${MANMODE} ${MAN8} ${DESTDIR}${MANDIR}8
+	${INSTALL} -d ${DESTDIR}${MANDIR}/man5
+	${INSTALL} -m ${MANMODE} ${MAN5} ${DESTDIR}${MANDIR}/man5
+	${INSTALL} -d ${DESTDIR}${MANDIR}/man8
+	${INSTALL} -m ${MANMODE} ${MAN8} ${DESTDIR}${MANDIR}/man8
 
 _confinstall:
 	${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
diff --git a/common.c b/common.c
index fabc40da..9ac25898 100644
--- a/common.c
+++ b/common.c
@@ -61,7 +61,9 @@
 int clock_monotonic;
 static char *lbuf;
 static size_t lbuf_len;
+#ifdef DEBUG_MEMORY
 static char lbuf_set;
+#endif
 
 #ifdef DEBUG_MEMORY
 static void
diff --git a/configure b/configure
index 2b54e131..885cc555 100755
--- a/configure
+++ b/configure
@@ -23,6 +23,7 @@ for x; do
 	--mandir) MANDIR=$var;;
 	--with-ccopts|CFLAGS) CFLAGS=$var;;
 	CPPFLAGS) CPPFLAGS=$var;;
+	--with-hook|--with-hooks|HOOKSCRIPTS) HOOKSCRIPTS=$var;;
 	esac
 done
 
@@ -68,6 +69,13 @@ if [ -n "$CPPLAGS" ]; then
 fi
 
 if [ "$DEBUG" != no -a "$DEBUG" != false ]; then
+	echo "Enabling memory debugging"
+	echo "CPPFLAGS+=	-DDEBUG_MEMORY" >>$CONFIG_MK
+elif [ -d .git ]; then
+	printf "Found git ... "
+	DEBUG=yes
+fi
+if [ "$DEBUG" != no -a "$DEBUG" != false ] || [ -e .git ]; then
 	echo "Adding debugging CFLAGS"
 	cat <<EOF >>$CONFIG_MK
 CFLAGS+=	-Wall -Wextra -Wimplicit -Wshadow -Wformat=2
@@ -77,7 +85,6 @@ CFLAGS+=	-Wredundant-decls  -Wnested-externs
 CFLAGS+=	-Winline -Wwrite-strings -Wcast-align -Wcast-qual
 CFLAGS+=	-Wpointer-arith
 CFLAGS+=	-Wdeclaration-after-statement -Wsequence-point
-CPPFLAGS+=	-DDEBUG_MEMORY
 EOF
 fi
 
@@ -176,3 +183,30 @@ else
 	echo "#include \"compat/strlcpy.h\"" >>$CONFIG_H
 fi
 rm -f _strlcpy.c _strlcpy
+
+cd dhcpcd-hooks
+HOOKS=
+for x in $HOOKSCRIPTS; do
+	printf "Finding hook $x ... "
+	for h in [0-9][0-9]"-$x" [0-9][0-9]"-$x.sh" [0-9][0-9]"-$x.conf"; do
+		[ -e "$h" ] && break
+	done
+	if [ ! -e "$h" ]; then
+		echo "no"
+	else
+		echo "$h"
+		HOOKS="$HOOKS${HOOKS:+ }$h"
+	fi
+done
+cd -
+echo "HOOKSCRIPTS=	$HOOKS" >>$CONFIG_MK
+
+echo
+echo "   SYSCONFDIR =		$SYSCONFDIR"
+echo "   SBINDIR =		$SBINDIR"
+echo "   LIBEXECDIR =		$LIBEXECDIR"
+echo "   DBDIR =		$DBDIR"
+echo "   RUNDIR =		$RUNDIR"
+echo "   MANDIR =		$MANDIR"
+echo "   HOOKSCRIPTS =	$HOOKSCRIPTS"
+echo
diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index 06d73f50..a8ed21fb 100644
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -4,7 +4,7 @@ include ${TOP}/config.mk
 
 SCRIPTSDIR=	${LIBEXECDIR}/dhcpcd-hooks
 SCRIPTS=	01-test 10-mtu 20-resolv.conf 29-lookup-hostname 30-hostname
-FILES=		${SCRIPTS} ${HOOKSCRIPTS}
+SCRIPTS+=	${HOOKSCRIPTS}
 
 all: