From a5e62d4b62f8773c1079c59a40276ba4e7d9daad Mon Sep 17 00:00:00 2001 From: bdrewery Date: Mon, 23 Mar 2015 03:59:04 +0000 Subject: Allow user to override MAKE_CMD without breaking gmake/fmake/scons ports. With hat: portmgr --- Mk/Uses/fmake.mk | 2 +- Mk/Uses/gmake.mk | 2 +- Mk/Uses/scons.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Mk/Uses') diff --git a/Mk/Uses/fmake.mk b/Mk/Uses/fmake.mk index 09f156448d58..e3944753534c 100644 --- a/Mk/Uses/fmake.mk +++ b/Mk/Uses/fmake.mk @@ -18,6 +18,6 @@ IGNORE= Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments FMAKE= ${LOCALBASE}/bin/fmake BUILD_DEPENDS+= ${FMAKE}:${PORTSDIR}/devel/fmake CONFIGURE_ENV+= MAKE=${FMAKE} -MAKE_CMD?= ${FMAKE} +MAKE_CMD= ${FMAKE} .endif .endif diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk index f650ec2aec4c..64675459e2e9 100644 --- a/Mk/Uses/gmake.mk +++ b/Mk/Uses/gmake.mk @@ -24,6 +24,6 @@ _GMAKE_EXT= -lite BUILD_DEPENDS+= gmake${_GMAKE_EXT}:${PORTSDIR}/devel/gmake${_GMAKE_EXT} CONFIGURE_ENV+= MAKE=gmake${_GMAKE_EXT} -MAKE_CMD?= gmake${_GMAKE_EXT} +MAKE_CMD= gmake${_GMAKE_EXT} .endif diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk index 59a9201ad387..9bf68fbef392 100644 --- a/Mk/Uses/scons.mk +++ b/Mk/Uses/scons.mk @@ -23,7 +23,7 @@ LIBPATH?= ${LOCALBASE}/lib CPPPATH?= ${LOCALBASE}/include SCONS= ${LOCALBASE}/bin/scons BUILD_DEPENDS+= ${SCONS}:${PORTSDIR}/devel/scons -MAKE_CMD?= ${SCONS} +MAKE_CMD= ${SCONS} MAKE_ARGS+= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ -- cgit