mirrors/dhcpcd
0
0
Fork 0
mirror of https://github.com/rsmarples/dhcpcd.git synced 2024-11-27 03:54:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix make proginstall target.

Browse Source
This commit is contained in:
Roy Marples 2017-03-31 10:48:42 +01:00
parent 4e65934b5f
commit b6ac903d24
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -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

12
hooks/Makefile
View File

@ -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.

6
src/Makefile
View File

@ -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