diff options
| author | Roy Marples <roy@marples.name> | 2021-01-30 11:46:06 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2021-01-30 11:46:06 +0000 |
| commit | b29f653581bfd327a0a49c1015e8759dafc1cd1b (patch) | |
| tree | 9894bad1cd7e7bc945e03de1c932672f9b158970 | |
| parent | 3848e7204f23bb78eb42dcde4898c70aca67d58d (diff) | |
| download | dhcpcd-b29f653581bfd327a0a49c1015e8759dafc1cd1b.tar.xz | |
import-src: adjust build target so all .in files are pre-built
While here, if we cannot find ypbind to work out how the hook script
should be configured, guess according to OS.
| -rwxr-xr-x | configure | 29 | ||||
| -rw-r--r-- | hooks/Makefile | 12 | ||||
| -rw-r--r-- | src/Makefile | 4 |
3 files changed, 35 insertions, 10 deletions
@@ -1729,6 +1729,35 @@ if ! $HOOKSET; then EGHOOKS="$EGHOOKS${EGHOOKS:+ }$YPHOOK" else echo "not found" + YPHOOK="50-ypbind" + case "$OS" in + linux*) + YPHOOK="50-yp.conf" + YPOS="Linux" + ;; + freebsd*|dragonfly*) + YPOS="FreeBSD" + echo "YPDOMAIN_DIR=" >>$CONFIG_MK + echo "YPDOMAIN_SUFFIX=" >>$CONFIG_MK + ;; + netbsd*) + YPOS="NetBSD" + echo "YPDOMAIN_DIR= /var/yp" >>$CONFIG_MK + echo "YPDOMAIN_SUFFIX=.ypservers" >>$CONFIG_MK + ;; + openbsd*) + YPOS="OpenBSD" + echo "YPDOMAIN_DIR= /etc/yp" >>$CONFIG_MK + echo "YPDOMAIN_SUFFIX=" >>$CONFIG_MK + ;; + *) + YPHOOK= + ;; + esac + if [ -n "$YPHOOK" ]; then + echo "Assuming ypbind is $YPOS" + EGHOOKS="$EGHOOKS${EGHOOKS:+ }$YPHOOK" + fi fi fi diff --git a/hooks/Makefile b/hooks/Makefile index 7698d5e4..3bcf083c 100644 --- a/hooks/Makefile +++ b/hooks/Makefile @@ -66,14 +66,10 @@ import: ${SCRIPTS} ${FILES} ${INSTALL} -m ${NONBINMODE} ${SCRIPTS} /tmp/${DISTPREFIX}/dhcpcd-hooks ${INSTALL} -m ${NONBINMODE} ${FILES} /tmp/${DISTPREFIX}/dhcpcd-hooks -_import-src: +_import-src: all ${INSTALL} -d ${DESTDIR}/hooks - cp dhcpcd-run-hooks.in dhcpcd-run-hooks.8.in [0-9]* ${DESTDIR}/hooks - rm ${DESTDIR}/hooks/50-dhcpcd-compat - if [ `uname` = Linux ]; then \ - rm ${DESTDIR}/hooks/50-ypbind.in; \ - else \ - rm ${DESTDIR}/hooks/50-yp.conf; \ - fi + ${INSTALL} -m ${NONBINMODE} ${PROG} ${MAN8} ${DESTDIR}/hooks + ${INSTALL} -m ${NONBINMODE} ${SCRIPTS} ${DESTDIR}/hooks + ${INSTALL} -m ${NONBINMODE} ${FILES} ${DESTDIR}/hooks include ${TOP}/Makefile.inc diff --git a/src/Makefile b/src/Makefile index ed038728..65845988 100644 --- a/src/Makefile +++ b/src/Makefile @@ -111,10 +111,10 @@ distclean: clean rm -f .depend rm -f *.diff *.patch *.orig *.rej -_import-src: ${SRCS} +_import-src: ${SRCS} ${MAN5} ${MAN8} ${INSTALL} -d ${DESTDIR}/src touch if-bsd.h if-linux.h if-sun.h - for x in defs.h ${SRCS} ${SRCS:.c=.h} dev.h ${MAN5}.in ${MAN8}.in; do \ + for x in defs.h ${SRCS} ${SRCS:.c=.h} dev.h ${MAN5} ${MAN8}; do \ cp $$x ${DESTDIR}/src; \ done cp dhcpcd.conf ${DESTDIR}/src |