From owner-svn-src-head@freebsd.org Thu Sep 17 00:17:33 2015 Return-Path: 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 920DA9CD4E8; Thu, 17 Sep 2015 00:17: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 834D31C30; Thu, 17 Sep 2015 00:17: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 t8H0HXc8074619; Thu, 17 Sep 2015 00:17:33 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8H0HXw1074618; Thu, 17 Sep 2015 00:17:33 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201509170017.t8H0HXw1074618@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 17 Sep 2015 00:17:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287887 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 00:17:33 -0000 Author: bdrewery Date: Thu Sep 17 00:17:32 2015 New Revision: 287887 URL: https://svnweb.freebsd.org/changeset/base/287887 Log: META_MODE: Don't define the default MAKEOBJDIR twice. Just expand the default. Sponsored by: EMC / Isilon Storage Division 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 17 00:03:55 2015 (r287886) +++ head/share/mk/local.meta.sys.mk Thu Sep 17 00:17:32 2015 (r287887) @@ -23,8 +23,8 @@ MAKEOBJDIRPREFIX= MAKEOBJDIR=${_default_makeobjdir} # export but do not track .export-env MAKEOBJDIR -# now for our own use -MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},} +# Expand for our own use +MAKEOBJDIR:= ${MAKEOBJDIR} .endif .endif .if !empty(SB)