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 29b9687ae9316e208b56c1224727f675c6cfada3..2173dec8e66728c5e1e8252f2315e81261e422fa 100644 (file)
--- 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 ae2df0578d47d243a473d85c16f4b52f58e5e307..9ee35b1783a2a6d0bb7718984d3bf8a0613b56f9 100644 (file)
--- 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