svn commit: r340687 - branches/2014Q1/Mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Jan 22 07:59:43 2014
New Revision: 340687
URL: http://svnweb.freebsd.org/changeset/ports/340687
QAT: https://qat.redports.org/buildarchive/r340687/

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

Modified:
  branches/2014Q1/Mk/bsd.stage.mk
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/Mk/bsd.stage.mk
==============================================================================
--- branches/2014Q1/Mk/bsd.stage.mk	Wed Jan 22 07:58:30 2014	(r340686)
+++ branches/2014Q1/Mk/bsd.stage.mk	Wed Jan 22 07:59:43 2014	(r340687)
@@ -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} \