From: Roy Marples <roy@marples.name>
Date: Tue, 21 Mar 2017 15:28:03 +0000 (+0000)
Subject: Fix man page paths.
X-Git-Tag: v7.0.0-beta1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d8541aad59a92e66e39912545d40129f2dac962;p=thirdparty%2Fdhcpcd.git

Fix man page paths.
---

diff --git a/Makefile.inc b/Makefile.inc
index ddeec43d..9b5bddd0 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -16,6 +16,9 @@ HOST_SH?=	/bin/sh
 CKSUM?=		cksum -a SHA256
 PGP?=		netpgp
 
+SCRIPT=		${LIBEXECDIR}/dhcpcd-run-hooks
+HOOKDIR=	${LIBEXECDIR}/dhcpcd-hooks
+
 SED_RUNDIR=		-e 's:@RUNDIR@:${RUNDIR}:g'
 SED_DBDIR=		-e 's:@DBDIR@:${DBDIR}:g'
 SED_LIBDIR=		-e 's:@LIBDIR@:${LIBDIR}:g'
diff --git a/hooks/Makefile b/hooks/Makefile
index 2043ace0..1b2f3a60 100644
--- a/hooks/Makefile
+++ b/hooks/Makefile
@@ -1,5 +1,4 @@
 TOP?=	../
-include ${TOP}/Makefile.inc
 include ${TOP}/iconfig.mk
 
 SCRIPT=		dhcpcd-run-hooks
@@ -8,7 +7,7 @@ CLEANFILES=	dhcpcd-run-hooks
 MAN8=		dhcpcd-run-hooks.8
 CLEANFILES+=	dhcpcd-run-hooks.8
 
-SCRIPTSDIR=	${LIBEXECDIR}/dhcpcd-hooks
+SCRIPTSDIR=	${HOOKDIR}
 SCRIPTS=	01-test 02-dump
 SCRIPTS+=	20-resolv.conf
 SCRIPTS+=	30-hostname
@@ -61,3 +60,5 @@ import: ${HOOKSCRIPTS}
 	${INSTALL} -d /tmp/${DISTPREFIX}/dhcpcd-hooks
 	${INSTALL} -m ${NONBINMODE} ${SCRIPTS} /tmp/${DISTPREFIX}/dhcpcd-hooks
 	${INSTALL} -m ${NONBINMODE} ${FILES} /tmp/${DISTPREFIX}/dhcpcd-hooks
+
+include ${TOP}/Makefile.inc
diff --git a/src/Makefile b/src/Makefile
index 49ad3f9d..f7b904f7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,18 +31,6 @@ FILESDIR=	${SYSCONFDIR}
 
 SUBDIRS=	${MKDIRS}
 
-SED_RUNDIR=		-e 's:@RUNDIR@:${RUNDIR}:g'
-SED_DBDIR=		-e 's:@DBDIR@:${DBDIR}:g'
-SED_LIBDIR=		-e 's:@LIBDIR@:${LIBDIR}:g'
-SED_DATADIR=		-e 's:@DATADIR@:${DATADIR}:g'
-SED_HOOKDIR=		-e 's:@HOOKDIR@:${HOOKDIR}:g'
-SED_SERVICEEXISTS=	-e 's:@SERVICEEXISTS@:${SERVICEEXISTS}:g'
-SED_SERVICECMD=		-e 's:@SERVICECMD@:${SERVICECMD}:g'
-SED_SERVICESTATUS=	-e 's:@SERVICESTATUS@:${SERVICESTATUS}:g'
-SED_STATUSARG=		-e 's:@STATUSARG@:${STATUSARG}:g'
-SED_SCRIPT=		-e 's:@SCRIPT@:${SCRIPT}:g'
-SED_SYS=		-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
-
 DEPEND!=	test -e .depend && echo ".depend" || echo ""
 
 CLEANFILES+=	*.tar.xz