Fix makeman creating obj directories due to turning on WITH_AUTO_OBJ.

r284708 addressed this slightly but seems to have put the make(showconfig)
guard in the wrong place.  Rather than guard setting the default obj directory,
guard inclusion of auto.obj.mk.  This avoids creating SRCTOP/obj and
SRCTOP/release/obj when running makeman.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery
2015-09-17 16:38:32 +00:00
parent e4c53d3bf0
commit 66e5857b42
2 changed files with 2 additions and 4 deletions
-2
View File
@@ -10,7 +10,6 @@ MK_INSTALL_AS_USER= yes
_default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},}
.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0
.if !make(showconfig)
.if defined(MAKEOBJDIRPREFIX)
# put things approximately where they want
OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP}/
@@ -25,7 +24,6 @@ MAKEOBJDIR=${_default_makeobjdir}
# Expand for our own use
MAKEOBJDIR:= ${MAKEOBJDIR}
.endif
.endif
.if !empty(SB)
SB_OBJROOT ?= ${SB}/obj/
# this is what we use below
+2 -2
View File
@@ -47,8 +47,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \
.endif
.if ${MK_AUTO_OBJ} == "yes"
# This needs to be done early - before .PATH is computed
# Don't do this if just running make -V
.if ${.MAKEFLAGS:M-V} == ""
# Don't do this if just running 'make -V' or 'make showconfig'
.if ${.MAKEFLAGS:M-V} == "" && !make(showconfig)
.sinclude <auto.obj.mk>
.endif
.endif