From owner-svn-src-head@FreeBSD.ORG  Sat Jun 20 21:48:07 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E5641469;
 Sat, 20 Jun 2015 21:48:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.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 D37A5BE7;
 Sat, 20 Jun 2015 21:48:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KLm7Vl091031;
 Sat, 20 Jun 2015 21:48:07 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KLm7hI091030;
 Sat, 20 Jun 2015 21:48:07 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201506202148.t5KLm7hI091030@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 20 Jun 2015 21:48:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284650 - 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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2015 21:48:08 -0000

Author: sjg
Date: Sat Jun 20 21:48:07 2015
New Revision: 284650
URL: https://svnweb.freebsd.org/changeset/base/284650

Log:
  Deal with MAKEOBJDIRPREFIX
  
  MAKEOBJDIRPREFIX does not really fit our model.
  Use it to set OBJROOT to about where user expects
  and set MAKEOBJDIR to do what we want.

Modified:
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Sat Jun 20 20:54:05 2015	(r284649)
+++ head/share/mk/local.meta.sys.mk	Sat Jun 20 21:48:07 2015	(r284650)
@@ -8,6 +8,18 @@
 MK_INSTALL_AS_USER= yes
 
 .if empty(OBJROOT) || ${.MAKE.LEVEL} == 0
+.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX})
+.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR...
+# put things approximately where they want
+OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/
+# OBJTOP set below
+MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},}
+MAKEOBJDIRPREFIX=
+# export but do not track
+.export-env MAKEOBJDIRPREFIX MAKEOBJDIR
+# now for our own use
+MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},}
+.endif
 .if !empty(SB)
 SB_OBJROOT ?= ${SB}/obj/
 # this is what we use below