Date: Fri, 11 Mar 2011 16:24:49 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r219505 - stable/8 Message-ID: <201103111624.p2BGOnDC086113@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Fri Mar 11 16:24:49 2011 New Revision: 219505 URL: http://svn.freebsd.org/changeset/base/219505 Log: MFC 219137: Fully honor KERNSRCDIR for 'make universe' if it is set. Modified: stable/8/Makefile (contents, props changed) Modified: stable/8/Makefile ============================================================================== --- stable/8/Makefile Fri Mar 11 16:21:45 2011 (r219504) +++ stable/8/Makefile Fri Mar 11 16:24:49 2011 (r219505) @@ -289,6 +289,7 @@ MAKE_JUST_WORLDS= YES .else UNIVERSE_TARGET?= buildworld .endif +KERNSRCDIR?= ${.CURDIR}/sys .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed @@ -321,8 +322,8 @@ universe_${target}: @echo ">> ${target} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" .endif .if !defined(MAKE_JUST_WORLDS) -.if exists(${.CURDIR}/sys/${target}/conf/NOTES) - @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ +.if exists(${KERNSRCDIR}/${target}/conf/NOTES) + @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) @@ -336,7 +337,7 @@ universe_kernels: universe_kernconfs .if !defined(TARGET) TARGET!= uname -m .endif -KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ +KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \ find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name NOTES universe_kernconfs:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103111624.p2BGOnDC086113>