Date: Sun, 24 Feb 2002 23:54:51 +0800 From: Clive Lin <clive@tongi.org> To: znerd@FreeBSD.org Cc: freebsd-java@FreeBSD.org Subject: jakarta-tomcat port Message-ID: <20020224155451.GA83007@malloc.eb.kliev.net>
next in thread | raw e-mail | index | archive | help
--azLHFNyN32YCQGCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
I think this patch is tiny but essential.. Inclusion of
tools.jar should be after awareness of JAVA_HOME, for people like me
do not like to pollute environment variables with JAVA* ;) How do you
think ?
- --
PGP key in header X-PGP-key. Mutt users simply do |gpg --verify would be
fine. Win32 users please google for "pgp freeware."
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iD8DBQE8eQytdFUoBaAIwD4RAmngAJ44MBDlBNlS2VsXR2DHEVaJCBhpywCeM6B0
rPoqgZVHWFk6CN9gsixofW0=
=yVtz
-----END PGP SIGNATURE-----
--azLHFNyN32YCQGCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="tomcat.diff"
Index: files/tomcatctl
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat/files/tomcatctl,v
retrieving revision 1.4
diff -u -r1.4 tomcatctl
--- files/tomcatctl 21 Feb 2002 20:06:55 -0000 1.4
+++ files/tomcatctl 24 Feb 2002 15:45:10 -0000
@@ -16,14 +16,14 @@
CLASSPATH=$i
fi
done
-if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then
- CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
-fi
# Check if the JAVA_HOME directory is defined, otherwise set it to the
# fallback default
if [ "${JAVA_HOME}a" = "a" ]; then
JAVA_HOME=%%JAVA_HOME%%
+fi
+if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then
+ CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
fi
JAVA_CMD=${JAVA_HOME}/bin/java
--azLHFNyN32YCQGCU--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-java" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020224155451.GA83007>