From owner-svn-src-all@freebsd.org  Fri Sep 11 04:03:59 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 98FD3A00449;
 Fri, 11 Sep 2015 04:03:59 +0000 (UTC)
 (envelope-from julian@freebsd.org)
Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16])
 (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 73AAC11C3;
 Fri, 11 Sep 2015 04:03:59 +0000 (UTC)
 (envelope-from julian@freebsd.org)
Received: from Julian-MBP3.local (ppp121-45-254-50.lns20.per4.internode.on.net
 [121.45.254.50]) (authenticated bits=0)
 by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id t8B43mA1040853
 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);
 Thu, 10 Sep 2015 21:03:51 -0700 (PDT)
 (envelope-from julian@freebsd.org)
Subject: Re: svn commit: r287636 - head/share/mk
To: "Simon J. Gerraty" <sjg@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
References: <201509110019.t8B0JocS082576@repo.freebsd.org>
From: Julian Elischer <julian@freebsd.org>
Message-ID: <55F2529E.5080105@freebsd.org>
Date: Fri, 11 Sep 2015 12:03:42 +0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0)
 Gecko/20100101 Thunderbird/38.2.0
MIME-Version: 1.0
In-Reply-To: <201509110019.t8B0JocS082576@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
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: Fri, 11 Sep 2015 04:03:59 -0000

On 9/11/15 8:19 AM, Simon J. Gerraty wrote:
> Author: sjg
> Date: Fri Sep 11 00:19:49 2015
> New Revision: 287636
> URL: https://svnweb.freebsd.org/changeset/base/287636
>
> Log:
>    Handle default MAKEOBJDIR for META_MODE.
>    If MAKEOBJDIRPREFIX is set, use it for default OBJROOT.
>    If MAKEOBJDIR is empty or not a suitable value (no '/')
>    set a default that works.

if not suitable..  it should error (with a really explicit error 
message), not do something else..
>    
>    Reviewed by: bdrewery
>
> Modified:
>    head/share/mk/local.meta.sys.mk
>
> Modified: head/share/mk/local.meta.sys.mk
> ==============================================================================
> --- head/share/mk/local.meta.sys.mk	Thu Sep 10 22:47:26 2015	(r287635)
> +++ head/share/mk/local.meta.sys.mk	Fri Sep 11 00:19:49 2015	(r287636)
> @@ -13,11 +13,14 @@ MK_INSTALL_AS_USER= yes
>   .warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR...
>   # put things approximately where they want
>   OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/
> +MAKEOBJDIRPREFIX=
> +.export MAKEOBJDIRPREFIX
> +.endif
> +.if empty(MAKEOBJDIR) || ${MAKEOBJDIR:M*/*} == ""
>   # OBJTOP set below
>   MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},}
> -MAKEOBJDIRPREFIX=
>   # export but do not track
> -.export-env MAKEOBJDIRPREFIX MAKEOBJDIR
> +.export-env MAKEOBJDIR
>   # now for our own use
>   MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},}
>   .endif
>
>