[Midnightbsd-cvs] mports [20178] trunk/Mk/components/fake/vars.mk: honor _DESTDIR_VIA_ENV to improve compatibiity with freebsd ports
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Sep 8 19:27:58 EDT 2015
Revision: 20178
http://svnweb.midnightbsd.org/mports/?rev=20178
Author: laffer1
Date: 2015-09-08 19:27:57 -0400 (Tue, 08 Sep 2015)
Log Message:
-----------
honor _DESTDIR_VIA_ENV to improve compatibiity with freebsd ports
Modified Paths:
--------------
trunk/Mk/components/fake/vars.mk
Modified: trunk/Mk/components/fake/vars.mk
===================================================================
--- trunk/Mk/components/fake/vars.mk 2015-09-08 22:40:34 UTC (rev 20177)
+++ trunk/Mk/components/fake/vars.mk 2015-09-08 23:27:57 UTC (rev 20178)
@@ -13,7 +13,7 @@
FAKE_TARGET?= ${INSTALL_TARGET}
DESTDIRNAME?= DESTDIR
FAKE_DESTDIR?= ${WRKDIR}/${FAKE_INSTALLDIR}
-FAKE_MAKEARGS?= ${MAKE_ARGS} ${DESTDIRNAME}=${FAKE_DESTDIR}
+FAKE_MAKEARGS?= ${MAKE_ARGS}
FAKE_SETUP= TRUE_PREFIX=${TRUE_PREFIX} PREFIX=${FAKE_DESTDIR}${TRUE_PREFIX} \
MANPREFIX=${FAKE_DESTDIR}${MANPREFIX:S/^${FAKE_DESTDIR}//} \
@@ -20,8 +20,16 @@
LINUXBASE=${FAKE_DESTDIR}${LINUXBASE:S/^${FAKE_DESTDIR}//} \
HOME=/${PKGBASE}_installs_to_home \
KMODDIR=${FAKE_DESTDIR}${KMODDIR:S/^${FAKE_DESTDIR}//}
-
+# For FreeBSD ports compatibility, we honor _DESTDIR_VIA_ENV which sets
+# DESTDIR to make args by default and env if needed (ninja)
+.if defined(_DESTDIR_VIA_ENV)
+# equivalent to MAKE_ENV
+FAKE_SETUP+= ${DESTDIRNAME}=${FAKE_DESTDIR}
+.else
+FAKE_MAKEARGS+= ${DESTDIRNAME}=${FAKE_DESTDIR}
+.endif
+
.if defined(FAKE_OPTS)
.if ${FAKE_OPTS:Mtrueprefix}x != "x"
# do this to FAKE_MAKEARGS so that post-install,pre-install still get a twiddled ${PREFIX}
More information about the Midnightbsd-cvs
mailing list