From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 17 Sep 2015 16:38:32 +0000 (+0000)
Subject: Fix makeman creating obj directories due to turning on WITH_AUTO_OBJ.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f09841e04ba5b833e9fefb1a1b7d1413c1e69ba8;p=people%2Fjulieng%2Ffreebsd.git

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
---

diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index 29b9687ae931..2173dec8e667 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -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
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index ae2df0578d47..9ee35b1783a2 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -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