From 81068d260f2fbaf4c752647503cfe13ac4291b14 Mon Sep 17 00:00:00 2001
From: Ernst de Haan <znerd@FreeBSD.org>
Date: Mon, 25 Feb 2002 08:02:51 +0000
Subject: Now sets the CLASSPATH *after* JAVA_HOME is determined.

Reported by: Clive Lin <clive@tongi.org>
---
 www/tomcat41/files/tomcatctl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/tomcat41/files')

diff --git a/www/tomcat41/files/tomcatctl b/www/tomcat41/files/tomcatctl
index a28cac7623a2..9992f023380b 100644
--- a/www/tomcat41/files/tomcatctl
+++ b/www/tomcat41/files/tomcatctl
@@ -16,15 +16,15 @@ for i in ${APP_HOME}/lib/* ; do
 		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
 
 
-- 
cgit v1.2.3