Move dhcpcd-hooks outside of src

diff --git a/Makefile.inc b/Makefile.inc
index 22151ab57e51ad76fc2431ff8ecb861e0188a37a..8964381d0d673bbba6dfe8eb44e2c3f6371683cd 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -10,3 +10,15 @@ CONFMODE?=   0644
 CC?=           cc
 INSTALL?=      install
 SED?=          sed
+
+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'

diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index 92108dc554b7051ea716f5cee53bdafd28c143d8..2043ace07cafd4b5424559cf15c0d3ce2b1b2a1e 100644 (file)
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -2,6 +2,12 @@ TOP?=  ../
 include ${TOP}/Makefile.inc
 include ${TOP}/iconfig.mk
 
+SCRIPT=                dhcpcd-run-hooks
+SCRIPTDIR=     ${LIBEXECDIR}
+CLEANFILES=    dhcpcd-run-hooks
+MAN8=          dhcpcd-run-hooks.8
+CLEANFILES+=   dhcpcd-run-hooks.8
+
 SCRIPTSDIR=    ${LIBEXECDIR}/dhcpcd-hooks
 SCRIPTS=       01-test 02-dump
 SCRIPTS+=      20-resolv.conf
@@ -15,20 +21,27 @@ FILES+=             15-timezone
 FILES+=                29-lookup-hostname
 FILES+=                ${EGHOOKSCRIPTS}
 
-all: ${HOOKSCRIPTS} ${EGHOOKSCRIPTS}
+.SUFFIXES:     .in
 
-50-ypbind: 50-ypbind.in
-       ${SED} \
+.in: Makefile ${TOP}/config.mk
+       ${SED} ${SED_RUNDIR} ${SED_DBDIR} ${SED_LIBDIR} ${SED_HOOKDIR} \
+               ${SED_SYS} ${SED_SCRIPT} ${SED_DATADIR} \
+               ${SED_SERVICEEXISTS} ${SED_SERVICECMD} ${SED_SERVICESTATUS} \
+               ${SED_STATUSARG} \
                -e 's:@YPDOMAIN_DIR@:${YPDOMAIN_DIR}:g' \
                -e 's:@YPDOMAIN_SUFFIX@:${YPDOMAIN_SUFFIX}:g' \
-               50-ypbind.in > $@
+               $< > $@
+
+all: ${SCRIPT} ${MAN8} ${SCRIPTS} ${EGHOOKSCRIPTS}
 
 clean:
-       rm -f 50-ypbind
+       rm -f ${CLEANFILES} 50-ypbind
 
 depend:
 
 proginstall: ${HOOKSCRIPTS}
+       ${INSTALL} -d ${DESTDIR}${SCRIPTDIR}
+       ${INSTALL} -m ${BINMODE} ${SCRIPT} ${DESTDIR}${SCRIPTDIR}
        ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
        ${INSTALL} -m ${NONBINMODE} ${SCRIPTS} ${DESTDIR}${SCRIPTSDIR}
        # We need to remove the old MTU change script if we at all can.
@@ -38,7 +51,11 @@ eginstall: ${EGHOOKSCRIPTS}
        ${INSTALL} -d ${DESTDIR}${FILESDIR}
        ${INSTALL} -m ${NONBINMODE} ${FILES} ${DESTDIR}${FILESDIR}
 
-install: proginstall eginstall
+maninstall: ${MAN8}
+       ${INSTALL} -d ${DESTDIR}${MANDIR}/man8
+       ${INSTALL} -m ${MANMODE} ${MAN8} ${DESTDIR}${MANDIR}/man8
+
+install: proginstall eginstall maninstall
 
 import: ${HOOKSCRIPTS}
        ${INSTALL} -d /tmp/${DISTPREFIX}/dhcpcd-hooks

diff --git a/src/dhcpcd-run-hooks.8.in b/dhcpcd-hooks/dhcpcd-run-hooks.8.in
similarity index 100%
rename from src/dhcpcd-run-hooks.8.in
rename to dhcpcd-hooks/dhcpcd-run-hooks.8.in

diff --git a/src/dhcpcd-run-hooks.in b/dhcpcd-hooks/dhcpcd-run-hooks.in
similarity index 100%
rename from src/dhcpcd-run-hooks.in
rename to dhcpcd-hooks/dhcpcd-run-hooks.in

diff --git a/src/Makefile b/src/Makefile
index cff6a0783a374345aa76f6831b2323e5f0837c84..1ab547fef71efe8d8d1e8bfb95f4d6ae76eb8408 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,16 +20,9 @@ DHCPCD_DEFS?=        dhcpcd-definitions.conf
 
 OBJS+=         ${SRCS:.c=.o} ${CRYPT_SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
 
-SCRIPT=                ${LIBEXECDIR}/dhcpcd-run-hooks
-HOOKDIR=       ${LIBEXECDIR}/dhcpcd-hooks
-
 MAN5=          dhcpcd.conf.5
-MAN8=          dhcpcd.8 dhcpcd-run-hooks.8
-CLEANFILES=    dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
-
-SCRIPTS=       dhcpcd-run-hooks
-SCRIPTSDIR=    ${LIBEXECDIR}
-CLEANFILES+=   dhcpcd-run-hooks
+MAN8=          dhcpcd.8
+CLEANFILES=    dhcpcd.conf.5 dhcpcd.8
 
 FILES=         dhcpcd.conf
 FILESDIR=      ${SYSCONFDIR}
@@ -101,11 +94,7 @@ _proginstall: ${PROG}
        ${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${SBINDIR}
        ${INSTALL} -d ${DESTDIR}${DBDIR}
 
-_scriptsinstall: ${SCRIPTS}
-       ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
-       ${INSTALL} -m ${BINMODE} ${SCRIPTS} ${DESTDIR}${SCRIPTSDIR}
-
-proginstall: _proginstall _scriptsinstall ${EMBEDDEDINSTALL}
+proginstall: _proginstall ${EMBEDDEDINSTALL}
        for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
 
 _maninstall: ${MAN5} ${MAN8}
@@ -146,9 +135,6 @@ _confinstall:
                        ${DESTDIR}${DBDIR}/rdm_monotonic; \
        fi
        
-hooks:
-       cd dhcpcd-hooks; ${MAKE}; cd ..; done
-
 eginstall:
        for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done