Moved the MAKEOBJDIRPREFIX check from Makefile.inc1 to Makefile,

to suppress warnings with installworld and distributeworld when
env(1) cannot be found in the PATH.

1 files changed, 6 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 51bd582efda0..67406a7c7089 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,12 @@ TGTS+=	${BITGTS}
 
 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKEOBJDIRPREFIX?=	/usr/obj
+_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \
+		-f /dev/null -V MAKEOBJDIRPREFIX dummy
+.if !empty(_MAKEOBJDIRPREFIX)
+.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
+	(in /etc/make.conf) or command-line variable.
+.endif
 MAKEPATH=	${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
 BINMAKE= \
 	`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \