From: Roy Marples <roy@marples.name>
Date: Tue, 22 Dec 2015 22:26:09 +0000 (+0000)
Subject: Install hooks that should not be installed by default into
X-Git-Tag: v6.10.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f88b4fa52226069200fefcd78bf209d20ba50fce;p=thirdparty%2Fdhcpcd.git

Install hooks that should not be installed by default into
$(datadir)/dhcpcd/hooks.
Start with timezone.
---

diff --git a/configure b/configure
index e44cb20a..57b1b69a 100755
--- a/configure
+++ b/configure
@@ -52,6 +52,7 @@ for x do
 	--dbdir) DBDIR=$var;;
 	--rundir) RUNDIR=$var;;
 	--mandir) MANDIR=$var;;
+	--datadir) DATADIR=$var;;
 	--with-ccopts|CFLAGS) CFLAGS=$var;;
 	CC) CC=$var;;
 	CPPFLAGS) CPPFLAGS=$var;;
@@ -77,7 +78,7 @@ for x do
 	--serviceexists) SERVICEEXISTS=$var;;
 	--servicecmd) SERVICECMD=$var;;
 	--servicestatus) SERVICESTATUS=$var;;
-	--datadir|--infodir|--includedir) ;; # ignore autotools
+	--infodir|--includedir) ;; # ignore autotools
 	--disable-maintainer-mode|--disable-dependency-tracking) ;;
 	--disable-silent-rules) ;;
 	-V|--version)
@@ -160,6 +161,7 @@ done
 : ${DBDIR:=$STATEDIR/db}
 : ${RUNDIR:=$STATEDIR/run}
 : ${MANDIR:=${PREFIX:-/usr}/share/man}
+: ${DATADIR:=${PREFIX:-/usr}/share}
 
 eval SYSCONFDIR="$SYSCONFDIR"
 eval LIBDIR="$LIBDIR"
@@ -168,6 +170,7 @@ eval STATEDIR="$STATEDIR"
 eval DBDIR="$DBDIR"
 eval RUNDIR="$RUNDIR"
 eval MANDIR="$MANDIR"
+eval DATADIR="$DATADIR"
 
 _which()
 {
@@ -243,6 +246,7 @@ for x in SYSCONFDIR SBINDIR LIBDIR LIBEXECDIR DBDIR RUNDIR; do
 done
 echo "LIBDIR=		$LIBDIR" >>$CONFIG_MK
 echo "MANDIR=		$MANDIR" >>$CONFIG_MK
+echo "DATADIR=		$DATADIR" >>$CONFIG_MK
 
 # Always obey CC.
 if [ -n "$CC" ]; then
@@ -1283,6 +1287,7 @@ echo "   LIBEXECDIR =		$LIBEXECDIR"
 echo "   DBDIR =		$DBDIR"
 echo "   RUNDIR =		$RUNDIR"
 echo "   MANDIR =		$MANDIR"
+echo "   DATADIR =		$DATADIR"
 echo "   HOOKSCRIPTS =	$HOOKS"
 echo
 
diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index 373d85dc..91cd56a6 100644
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -4,10 +4,14 @@ include ${TOP}/iconfig.mk
 
 SCRIPTSDIR=	${LIBEXECDIR}/dhcpcd-hooks
 SCRIPTS=	01-test 02-dump
-SCRIPTS+=	10-wpa_supplicant 15-timezone 20-resolv.conf
+SCRIPTS+=	10-wpa_supplicant 20-resolv.conf
 SCRIPTS+=	29-lookup-hostname 30-hostname
 SCRIPTS+=	${HOOKSCRIPTS}
 
+# Some hooks should not be installed by default
+FILESDIR=	${DATADIR}/dhcpcd/hooks
+FILES=		15-timezone
+
 50-ypbind: 50-ypbind.in
 	${SED} \
 		-e 's:@YPDOMAIN_DIR@:${YPDOMAIN_DIR}:g' \
@@ -25,7 +29,11 @@ proginstall: ${HOOKSCRIPTS}
 	# We need to remove the old MTU change script if we at all can.
 	rm -f ${DESTDIR}${SCRIPTSDIR}/10-mtu
 
-install: proginstall
+eginstall:
+	${INSTALL} -d ${DESTDIR}${FILESDIR}
+	${INSTALL} -m ${NONBINMODE} ${FILES} ${DESTDIR}${FILESDIR}
+
+install: proginstall eginstall
 
 import: ${HOOKSCRIPTS}
 	${INSTALL} -d /tmp/${DISTPREFIX}/dhcpcd-hooks