diff options
| author | jlam <jlam> | 2003-01-28 22:03:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-28 22:03:00 +0000 |
| commit | 0888156f21e01be033066b564dc798018954d33c (patch) | |
| tree | d3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /www/jakarta-tomcat | |
| parent | 3782ed07f81d21f716d6f09001f4d66a5c4f8784 (diff) | |
| download | pkgsrc-0888156f21e01be033066b564dc798018954d33c.tar.gz | |
Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES". This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile. Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
Diffstat (limited to 'www/jakarta-tomcat')
| -rw-r--r-- | www/jakarta-tomcat/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index c8414545ac8..92cca949548 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/12/28 22:34:13 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2003/01/28 22:04:29 jlam Exp $ DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src PKGNAME= ${DISTNAME:S/-src$//} @@ -16,7 +16,7 @@ DEPENDS+= jakarta-ant>=1.4.1:../../devel/jakarta-ant WRKSRC= ${WRKDIR}/${DISTNAME} -USE_BUILDLINK2= # defined +USE_BUILDLINK2= yes MAKEFILE= build.xml ALL_TARGET= main INSTALL_TARGET= dist @@ -24,6 +24,7 @@ INSTALL_TARGET= dist SAMPLECONFDIR= ${PREFIX}/tomcat/conf PKG_SYSCONFDIR.jakarta-tomcat= ${SAMPLECONFDIR} +USE_PKGINSTALL= yes OWN_DIRS= ${PREFIX}/tomcat MAKE_DIRS= ${PREFIX}/tomcat/conf MAKE_DIRS= ${PREFIX}/tomcat/logs @@ -52,7 +53,6 @@ post-install: ${RM} ${PREFIX}/tomcat/webapps/examples.war .include "../../mk/java-vm.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" MAKE_PROGRAM= ${LOCALBASE}/bin/ant |