Date: Thu, 17 Sep 2015 16:38:33 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287919 - head/share/mk Message-ID: <201509171638.t8HGcXsm079487@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Sep 17 16:38:32 2015 New Revision: 287919 URL: https://svnweb.freebsd.org/changeset/base/287919 Log: 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 Modified: head/share/mk/local.meta.sys.mk head/share/mk/sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Thu Sep 17 16:19:36 2015 (r287918) +++ head/share/mk/local.meta.sys.mk Thu Sep 17 16:38:32 2015 (r287919) @@ -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 Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Sep 17 16:19:36 2015 (r287918) +++ head/share/mk/sys.mk Thu Sep 17 16:38:32 2015 (r287919) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509171638.t8HGcXsm079487>