From owner-svn-src-head@freebsd.org  Thu Sep 17 16:38:33 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B27DD9CEE67;
 Thu, 17 Sep 2015 16:38:33 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 893561A22;
 Thu, 17 Sep 2015 16:38:33 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HGcXUF079489;
 Thu, 17 Sep 2015 16:38:33 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HGcXsm079487;
 Thu, 17 Sep 2015 16:38:33 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509171638.t8HGcXsm079487@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 17 Sep 2015 16:38:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287919 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 16:38:33 -0000

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