diff options
| author | jlam <jlam@pkgsrc.org> | 2002-12-28 22:34:13 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-12-28 22:34:13 +0000 |
| commit | 8d07c1b468aab6e5bf76682da7fe2699c3c83dd6 (patch) | |
| tree | f72eb317936300ad374c4341ae17296ab5c664aa /www/jakarta-tomcat | |
| parent | 9aa6ec3ba14038a737508d64e403d83cc9bd8965 (diff) | |
| download | pkgsrc-8d07c1b468aab6e5bf76682da7fe2699c3c83dd6.tar.gz | |
Use the JAVA_HOME of the JDK upon which the jakarta-tomcat package depends
as the default JAVA_HOME. It can still be overridden by an environment
variable.
Diffstat (limited to 'www/jakarta-tomcat')
| -rw-r--r-- | www/jakarta-tomcat/Makefile | 4 | ||||
| -rw-r--r-- | www/jakarta-tomcat/files/tomcat.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index 85accad7a91..c8414545ac8 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/12/28 21:35:04 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2002/12/28 22:34:13 jlam Exp $ DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src PKGNAME= ${DISTNAME:S/-src$//} @@ -37,6 +37,8 @@ CONF_FILES+= ${SAMPLECONFDIR}/${FILE}.default ${PKG_SYSCONFDIR}/${FILE} .endfor RCD_SCRIPTS= tomcat +FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} + post-patch: ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f for file in ${WRKSRC}/src/etc/workers.properties; do \ diff --git a/www/jakarta-tomcat/files/tomcat.sh b/www/jakarta-tomcat/files/tomcat.sh index e8c15da8540..38c68246834 100644 --- a/www/jakarta-tomcat/files/tomcat.sh +++ b/www/jakarta-tomcat/files/tomcat.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: tomcat.sh,v 1.7 2002/05/23 15:48:45 abs Exp $ +# $NetBSD: tomcat.sh,v 1.8 2002/12/28 22:34:14 jlam Exp $ # # PROVIDE: tomcat # REQUIRE: DAEMON @@ -12,7 +12,7 @@ PREFIX=@PREFIX@ if [ -z "${JAVA_HOME}" ] then - JAVA_HOME=${PREFIX}/java + JAVA_HOME="@JAVA_HOME@" export JAVA_HOME fi |