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 162cfb54e8ed9b091cb197a4aaad485ef7f8e75b..f2177a15264be991edc93d369efc4209f3e2ce5d 100644 (file)
--- 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 fabc40dae44d5eae9502dafc29f6a679246d9e09..9ac2589811b5426ae98473e587b0cc5fdc491b1b 100644 (file)
--- 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 2b54e1312e2631c5af794e4e7dabdff041fccb95..885cc555076ce83947b9779b2e5d2b85e6a9eaab 100755 (executable)
--- 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 06d73f5008f7bd65dc492c48429da15e3353cdae..a8ed21fb2c9775de8a0962a76a3fcb7a2af4a310 100644 (file)
--- 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: