Always compute the root of the kernel source tree and explicitly pass it

to module builds.  This avoids having to have the module builds walk up
the tree to find the kernel sources.  It also allows a kernel + module
build to succeed when a new level of module subdirectories is added without
requiring that the /usr/share/mk/bsd.kmod.mk file on the machine be patched.

MFC after:	1 week
This commit is contained in:
jhb 2009-05-04 20:25:56 +00:00
parent 9fea2e998c
commit 7c0aa0054b

View File

@ -12,7 +12,8 @@
.if defined(DESTDIR)
MKMODULESENV+= DESTDIR="${DESTDIR}"
.endif
MKMODULESENV+= KERNBUILDDIR="${.CURDIR}"
SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
MKMODULESENV+= KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
.MAIN: all
@ -29,7 +30,6 @@ modules-${target}:
# Handle out of tree ports
.if !defined(NO_MODULES) && defined(PORTS_MODULES)
SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
PORTSMODULESENV=SYSDIR=${SYSDIR}
.for __target in all install reinstall clean
${__target}: ports-${__target}