svn commit: r323942 - in head/Mk: . Uses

[Baptiste Daroussin]

Author: bapt
Date: Tue Jul 30 06:32:01 2013
New Revision: 323942
URL: http://svnweb.freebsd.org/changeset/ports/323942

Log:
  Define MAKE_CMD in post.mk to allow anything to overwrite it

Modified:
  head/Mk/Uses/fmake.mk
  head/Mk/Uses/gmake.mk
  head/Mk/bsd.commands.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/Uses/fmake.mk
==============================================================================
--- head/Mk/Uses/fmake.mk	Tue Jul 30 05:48:57 2013	(r323941)
+++ head/Mk/Uses/fmake.mk	Tue Jul 30 06:32:01 2013	(r323942)
@@ -19,6 +19,6 @@ IGNORE=	Incorrect 'USES+= fmake:${fmake_
 FMAKE=			${LOCALBASE}/bin/fmake
 BUILD_DEPENDS+=		${FMAKE}:${PORTSDIR}/devel/fmake
 CONFIGURE_ENV+=		MAKE=${FMAKE}
-MAKE_CMD=		${FMAKE}
+MAKE_CMD?=		${FMAKE}
 .endif
 .endif

Modified: head/Mk/Uses/gmake.mk
==============================================================================
--- head/Mk/Uses/gmake.mk	Tue Jul 30 05:48:57 2013	(r323941)
+++ head/Mk/Uses/gmake.mk	Tue Jul 30 06:32:01 2013	(r323942)
@@ -17,7 +17,6 @@ IGNORE=	Incorrect 'USES+= gmake:${gmake_
 
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 CONFIGURE_ENV+=		MAKE=${GMAKE}
-MAKE_CMD=		${GMAKE}
-_USES_POST+=		gmake
+MAKE_CMD?=		${GMAKE}
 
 .endif

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Tue Jul 30 05:48:57 2013	(r323941)
+++ head/Mk/bsd.commands.mk	Tue Jul 30 06:32:01 2013	(r323942)
@@ -58,7 +58,6 @@ LDCONFIG?=	/sbin/ldconfig
 LHA_CMD?=	${LOCALBASE}/bin/lha
 LN?=		/bin/ln
 LS?=		/bin/ls
-MAKE_CMD?=	/usr/bin/make
 MKDIR?=		/bin/mkdir -p
 MKTEMP?=	/usr/bin/mktemp
 MOUNT?=		/sbin/mount

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Jul 30 05:48:57 2013	(r323941)
+++ head/Mk/bsd.port.mk	Tue Jul 30 06:32:01 2013	(r323942)
@@ -2100,6 +2100,7 @@ DISTINFO_FILE?=		${MASTERDIR}/distinfo
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
+MAKE_CMD?=		/usr/bin/make
 MAKE_ENV+=		PREFIX=${PREFIX} \
 			LOCALBASE=${LOCALBASE} \
 			LIBDIR="${LIBDIR}" \