From: Roy Marples <roy@marples.name>
Date: Mon, 30 Mar 2020 20:40:04 +0000 (+0100)
Subject: hooks: Build all hooks before installing
X-Git-Tag: v9.0.1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3926bb37e0de484eac52f6b937095461434c1f8f;p=thirdparty%2Fdhcpcd.git

hooks: Build all hooks before installing
---

diff --git a/hooks/Makefile b/hooks/Makefile
index 152c2cee..3a1b5a23 100644
--- a/hooks/Makefile
+++ b/hooks/Makefile
@@ -43,7 +43,7 @@ distclean: clean
 
 depend:
 
-proginstall: ${PROG} ${HOOKSCRIPTS}
+proginstall: ${PROG} ${SCRIPTS}
 	${INSTALL} -d ${DESTDIR}${BINDIR}
 	${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
 	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
@@ -51,7 +51,7 @@ proginstall: ${PROG} ${HOOKSCRIPTS}
 	# We need to remove the old MTU change script if we at all can.
 	rm -f ${DESTDIR}${SCRIPTSDIR}/10-mtu
 
-eginstall: ${EGHOOKSCRIPTS}
+eginstall: ${FILES}
 	${INSTALL} -d ${DESTDIR}${FILESDIR}
 	${INSTALL} -m ${NONBINMODE} ${FILES} ${DESTDIR}${FILESDIR}
 
@@ -61,7 +61,7 @@ maninstall: ${MAN8}
 
 install: proginstall eginstall maninstall
 
-import: ${HOOKSCRIPTS}
+import: ${SCRIPTS} ${FILES}
 	${INSTALL} -d /tmp/${DISTPREFIX}/dhcpcd-hooks
 	${INSTALL} -m ${NONBINMODE} ${SCRIPTS} /tmp/${DISTPREFIX}/dhcpcd-hooks
 	${INSTALL} -m ${NONBINMODE} ${FILES} /tmp/${DISTPREFIX}/dhcpcd-hooks