From owner-svn-ports-head@FreeBSD.ORG  Tue Jan  7 08:17:18 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4C2CEF4C;
 Tue,  7 Jan 2014 08:17:18 +0000 (UTC)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3801F1D5B;
 Tue,  7 Jan 2014 08:17:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s078HImc001148;
 Tue, 7 Jan 2014 08:17:18 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s078HIRI001147;
 Tue, 7 Jan 2014 08:17:18 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401070817.s078HIRI001147@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 7 Jan 2014 08:17:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338982 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 08:17:18 -0000

Author: bapt
Date: Tue Jan  7 08:17:17 2014
New Revision: 338982
URL: http://svnweb.freebsd.org/changeset/ports/338982

Log:
  Add an internal variable to decide if DESTDIR should ve define in MAKE_ENV or MAKE_ARGS

Modified:
  head/Mk/bsd.stage.mk

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Tue Jan  7 08:16:25 2014	(r338981)
+++ head/Mk/bsd.stage.mk	Tue Jan  7 08:17:17 2014	(r338982)
@@ -5,7 +5,11 @@
 STAGEDIR?=	${WRKDIR}/stage
 DESTDIRNAME?=	DESTDIR
 
+.if defined(_DESTDIR_VIA_ENV)
+MAKE_ENV+=	${DESTDIRNAME}=${STAGEDIR}
+.else
 MAKE_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
+.endif
 QA_ENV+=	STAGEDIR=${STAGEDIR} \
 		PREFIX=${PREFIX} \
 		LOCALBASE=${LOCALBASE} \