diff options
author | abs <abs> | 2002-03-25 19:19:52 +0000 |
---|---|---|
committer | abs <abs> | 2002-03-25 19:19:52 +0000 |
commit | 8a011fdbd4259e9d2c6e83e7121ad0a32831c528 (patch) | |
tree | cab1438cc7593be7a087fc9f3776e2beeafefac3 | |
parent | 09c1c2a0201a4391dc83b7717a5c09f0b8844ccc (diff) | |
download | pkgsrc-8a011fdbd4259e9d2c6e83e7121ad0a32831c528.tar.gz |
73 dork points and a swift beating about the head with a clue-by-four for
my previous change.
When resetting any externally set MAKE_FLAGS, it makes sense to check if
this Makefile is trying to set it itself...
-rw-r--r-- | www/jakarta-tomcat/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index 1be2d0f41ef..1a1a3dba3fc 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/03/10 23:59:00 abs Exp $ +# $NetBSD: Makefile,v 1.25 2002/03/25 19:19:52 abs Exp $ DISTNAME= ${PKGNAME}-src PKGNAME= jakarta-tomcat-3.2.3 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} CLASSPATH:= ${LOCALBASE}/lib/java/servlet.jar:${LOCALBASE}/lib/jaxp.jar:${LOCALBASE}/lib/parser.jar:${CLASSPATH} MAKEFILE= build.xml -MAKE_FLAGS+= -Dpkgsrc.prefix=${PREFIX} +MAKE_FLAGS= -Dpkgsrc.prefix=${PREFIX} MAKE_ENV+= JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH} ALL_TARGET= main INSTALL_TARGET= dist @@ -49,4 +49,3 @@ post-install: .include "../../mk/bsd.pkg.mk" MAKE_PROGRAM= ${LOCALBASE}/bin/ant -MAKE_FLAGS= |