Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jan 2014 08:17:18 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338982 - head/Mk
Message-ID:  <201401070817.s078HIRI001147@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401070817.s078HIRI001147>