Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Mar 2015 04:07:09 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r381979 - in head/www: nginx nginx-devel
Message-ID:  <201503230407.t2N4794k015282@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Mon Mar 23 04:07:08 2015
New Revision: 381979
URL: https://svnweb.freebsd.org/changeset/ports/381979
QAT: https://qat.redports.org/buildarchive/r381979/

Log:
  Properly set MAKE_ENV and MAKE_CMD.
  
  With hat:	portmgr

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx/Makefile

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Mon Mar 23 04:04:58 2015	(r381978)
+++ head/www/nginx-devel/Makefile	Mon Mar 23 04:07:08 2015	(r381979)
@@ -957,11 +957,11 @@ pre-configure:
 .if ${PORT_OPTIONS:MMODSECURITY}
 	( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \
 		CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \
-		${MAKE} )
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
 .endif
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Mon Mar 23 04:04:58 2015	(r381978)
+++ head/www/nginx/Makefile	Mon Mar 23 04:07:08 2015	(r381979)
@@ -979,11 +979,11 @@ pre-configure:
 .if ${PORT_OPTIONS:MMODSECURITY}
 	( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \
 		CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \
-		${MAKE} )
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
 .endif
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503230407.t2N4794k015282>