diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-30 05:33:25 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-30 05:33:25 +0000 |
| commit | aa6a847926959ea7ca87791a3d4bfc654e08507e (patch) | |
| tree | b429f3be160799247a1198fd2afc400827484db1 /Mk | |
| parent | b3a72c888c6273233a04ecb8833ee7e615c6b952 (diff) | |
| download | ports-aa6a847926959ea7ca87791a3d4bfc654e08507e.tar.gz ports-aa6a847926959ea7ca87791a3d4bfc654e08507e.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/fmake.mk | 17 | ||||
| -rw-r--r-- | Mk/Uses/gmake.mk | 21 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
3 files changed, 3 insertions, 37 deletions
diff --git a/Mk/Uses/fmake.mk b/Mk/Uses/fmake.mk index 8baf7fe07820..6b5131cb4059 100644 --- a/Mk/Uses/fmake.mk +++ b/Mk/Uses/fmake.mk @@ -19,21 +19,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} - -.if !target(do-build) -do-build: - @set -e ; (cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${FMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ - if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ - ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ - fi; \ - ${FALSE}; \ - fi) -.endif - -.if !target(do-install) -do-install: - @set -e ; (cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endif +MAKE_CMD= ${FMAKE} .endif .endif diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk index 43c91f87e112..9c697ad1e7c1 100644 --- a/Mk/Uses/gmake.mk +++ b/Mk/Uses/gmake.mk @@ -17,26 +17,7 @@ IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake CONFIGURE_ENV+= MAKE=${GMAKE} +MAKE_CMD= ${GMAKE} _USES_POST+= gmake -.endif - -.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GMAKE_MK_POST) -_INCLUDE_USES_GMAKE_MK_POST= yes - -.if !target(do-build) -do-build: - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ - if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ - ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ - fi; \ - ${FALSE}; \ - fi) -.endif - -.if !target(do-install) -do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endif .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d32e2bc4fabe..a86e76923476 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3662,7 +3662,7 @@ do-configure: .if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ |