[Midnightbsd-cvs] mports [15640] trunk/Mk: explicitly set make command.

[laffer1 at midnightbsd.org]

Revision: 15640
          http://svnweb.midnightbsd.org/mports/?rev=15640
Author:   laffer1
Date:     2013-11-29 18:59:01 -0500 (Fri, 29 Nov 2013)
Log Message:
-----------
explicitly set make command.  Due to order of loading commands.mk, we need to force this when using gmake or fmake.

As we're not always using USE_GMAKE anymore, just use one path for run-build target. USES=gmake was not working properly.

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk
    trunk/Mk/extensions/fmake.mk
    trunk/Mk/extensions/gmake.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2013-11-29 22:44:56 UTC (rev 15639)
+++ trunk/Mk/bsd.mport.mk	2013-11-29 23:59:01 UTC (rev 15640)
@@ -2444,11 +2444,7 @@
 .endif
 
 run-build:
-.if defined(USE_GMAKE)
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})
-.else
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})
-.endif
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})
 
 
 

Modified: trunk/Mk/extensions/fmake.mk
===================================================================
--- trunk/Mk/extensions/fmake.mk	2013-11-29 22:44:56 UTC (rev 15639)
+++ trunk/Mk/extensions/fmake.mk	2013-11-29 23:59:01 UTC (rev 15640)
@@ -17,6 +17,6 @@
 FMAKE=			${LOCALBASE}/bin/fmake
 BUILD_DEPENDS+=		${FMAKE}:${PORTSDIR}/devel/fmake
 CONFIGURE_ENV+=		MAKE=${FMAKE}
-MAKE_CMD?=		${FMAKE}
+MAKE_CMD=		${FMAKE}
 .endif
 .endif

Modified: trunk/Mk/extensions/gmake.mk
===================================================================
--- trunk/Mk/extensions/gmake.mk	2013-11-29 22:44:56 UTC (rev 15639)
+++ trunk/Mk/extensions/gmake.mk	2013-11-29 23:59:01 UTC (rev 15640)
@@ -15,6 +15,6 @@
 
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 CONFIGURE_ENV+=		MAKE=${GMAKE}
-MAKE_CMD?=		${GMAKE}
+MAKE_CMD=		${GMAKE}
 
 .endif