From owner-svn-src-all@freebsd.org  Tue Dec 15 01:37:48 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 0EAD1A47EFE;
 Tue, 15 Dec 2015 01:37:48 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D616F2000;
 Tue, 15 Dec 2015 01:37:47 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBF1blDU031296;
 Tue, 15 Dec 2015 01:37:47 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBF1blJ3031295;
 Tue, 15 Dec 2015 01:37:47 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512150137.tBF1blJ3031295@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: Tue, 15 Dec 2015 01:37:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292240 - stable/10/share/mk
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 01:37:48 -0000

Author: bdrewery
Date: Tue Dec 15 01:37:46 2015
New Revision: 292240
URL: https://svnweb.freebsd.org/changeset/base/292240

Log:
  Partial MFC r291349:
  
    Standardize on OBJTOP in and outside of META MODE.
  
    For stable/10 this means bringing OBJTOP support in which simplifies
    MFCs.

Modified:
  stable/10/share/mk/bsd.obj.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.obj.mk
==============================================================================
--- stable/10/share/mk/bsd.obj.mk	Tue Dec 15 01:19:19 2015	(r292239)
+++ stable/10/share/mk/bsd.obj.mk	Tue Dec 15 01:37:46 2015	(r292240)
@@ -46,10 +46,13 @@ __<bsd.obj.mk>__:
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
+OBJTOP?= ${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
+OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
+
 #
 # Warn of unorthodox object directory.
 #