Fix make proginstall target.

diff --git a/Makefile b/Makefile
index 46afd8e0d9d4039dbc41e20cf2959d3969c2da46..dcc3a5f4959d9f4ae87eff3d7f1d0714cd4a337f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,9 @@ eginstall:
 install:
        for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
 
+proginstall:
+       for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
+
 clean:
        rm -rf cov-int
        for x in ${SUBDIRS} test; do cd $$x; ${MAKE} $@; cd ..; done

diff --git a/hooks/Makefile b/hooks/Makefile
index 1b2f3a60b4d19aa6cf6dcb5a718d47dd40068667..b07f9eb78c1561ae84e89acb485767a9dfdc9e1f 100644 (file)
--- a/hooks/Makefile
+++ b/hooks/Makefile
@@ -1,8 +1,8 @@
 TOP?=  ../
 include ${TOP}/iconfig.mk
 
-SCRIPT=                dhcpcd-run-hooks
-SCRIPTDIR=     ${LIBEXECDIR}
+PROG=          dhcpcd-run-hooks
+BINDIR=                ${LIBEXECDIR}
 CLEANFILES=    dhcpcd-run-hooks
 MAN8=          dhcpcd-run-hooks.8
 CLEANFILES+=   dhcpcd-run-hooks.8
@@ -31,16 +31,16 @@ FILES+=             ${EGHOOKSCRIPTS}
                -e 's:@YPDOMAIN_SUFFIX@:${YPDOMAIN_SUFFIX}:g' \
                $< > $@
 
-all: ${SCRIPT} ${MAN8} ${SCRIPTS} ${EGHOOKSCRIPTS}
+all: ${PROG} ${MAN8} ${SCRIPTS} ${EGHOOKSCRIPTS}
 
 clean:
        rm -f ${CLEANFILES} 50-ypbind
 
 depend:
 
-proginstall: ${HOOKSCRIPTS}
-       ${INSTALL} -d ${DESTDIR}${SCRIPTDIR}
-       ${INSTALL} -m ${BINMODE} ${SCRIPT} ${DESTDIR}${SCRIPTDIR}
+proginstall: ${PROG} ${HOOKSCRIPTS}
+       ${INSTALL} -d ${DESTDIR}${BINDIR}
+       ${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
        ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
        ${INSTALL} -m ${NONBINMODE} ${SCRIPTS} ${DESTDIR}${SCRIPTSDIR}
        # We need to remove the old MTU change script if we at all can.

diff --git a/src/Makefile b/src/Makefile
index f7b904f75e69847fbf6c2a9a25ea4efce2cd71af..b604af70741edff337e082b9bd54b6638c924f72 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,8 +29,6 @@ CLEANFILES=   dhcpcd.conf.5 dhcpcd.8
 FILES=         dhcpcd.conf
 FILESDIR=      ${SYSCONFDIR}
 
-SUBDIRS=       ${MKDIRS}
-
 DEPEND!=       test -e .depend && echo ".depend" || echo ""
 
 CLEANFILES+=   *.tar.xz
@@ -47,7 +45,6 @@ CLEANFILES+=  *.tar.xz
                $< > $@
 
 all: ${TOP}/config.h ${PROG} ${SCRIPTS} ${MAN5} ${MAN8}
-       for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
 
 dev:
        cd dev && ${MAKE}
@@ -83,7 +80,6 @@ _proginstall: ${PROG}
        ${INSTALL} -d ${DESTDIR}${DBDIR}
 
 proginstall: _proginstall ${EMBEDDEDINSTALL}
-       for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
 
 _maninstall: ${MAN5} ${MAN8}
        ${INSTALL} -d ${DESTDIR}${MANDIR}/man5
@@ -124,13 +120,11 @@ _confinstall:
        fi
        
 eginstall:
-       for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
 
 install: proginstall _maninstall _confinstall eginstall
 
 clean:
        rm -f ${OBJS} ${PROG} ${PROG}.core ${CLEANFILES}
-       for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
 
 distclean: clean
        rm -f .depend