aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2006-03-01 13:07:17 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2006-03-01 13:07:17 +0000
commitf1fb209627d79d0817ab3e8ca6ae9325d610b27f (patch)
tree091e594247ef7b42a4f37ae346ee2cccb3c60dd4
parentc068fdddc4109fd1297a06793d8b2850f45afcb8 (diff)
downloadsrc-f1fb209627d79d0817ab3e8ca6ae9325d610b27f.tar.gz
src-f1fb209627d79d0817ab3e8ca6ae9325d610b27f.zip
Do not discard the current value of __MAKE_CONF when testing
whether MAKEOBJDIRPREFIX is set at a wrong place. Reviewed by: ru MFC after: 3 days
Notes
Notes: svn path=/head/; revision=156145
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e7b62fde2404..5e084818665e 100644
--- a/Makefile
+++ b/Makefile
@@ -93,11 +93,11 @@ TGTS+= ${BITGTS}
PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
- ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \
+ ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
-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.
+ (in make.conf(5)) or command-line variable.
.endif
MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
BINMAKE= \