diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2002-02-25 08:02:51 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2002-02-25 08:02:51 +0000 |
| commit | 81068d260f2fbaf4c752647503cfe13ac4291b14 (patch) | |
| tree | 81e50ff7567256683b6531dcab581c0ca23fa196 /www | |
| parent | The value for ONLY_FOR_ARCHS (i386) was quoted, but that results in an error. (diff) | |
Now sets the CLASSPATH *after* JAVA_HOME is determined.
Reported by: Clive Lin <clive@tongi.org>
Notes
Notes:
svn path=/head/; revision=55219
Diffstat (limited to 'www')
| -rw-r--r-- | www/jakarta-tomcat/files/tomcatctl | 6 | ||||
| -rw-r--r-- | www/jakarta-tomcat3/files/tomcatctl | 6 | ||||
| -rw-r--r-- | www/jakarta-tomcat4/files/tomcatctl | 6 | ||||
| -rw-r--r-- | www/jakarta-tomcat41/files/tomcatctl | 6 | ||||
| -rw-r--r-- | www/tomcat41/files/tomcatctl | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/www/jakarta-tomcat/files/tomcatctl b/www/jakarta-tomcat/files/tomcatctl index a28cac7623a2..9992f023380b 100644 --- a/www/jakarta-tomcat/files/tomcatctl +++ b/www/jakarta-tomcat/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 diff --git a/www/jakarta-tomcat3/files/tomcatctl b/www/jakarta-tomcat3/files/tomcatctl index a28cac7623a2..9992f023380b 100644 --- a/www/jakarta-tomcat3/files/tomcatctl +++ b/www/jakarta-tomcat3/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 diff --git a/www/jakarta-tomcat4/files/tomcatctl b/www/jakarta-tomcat4/files/tomcatctl index a28cac7623a2..9992f023380b 100644 --- a/www/jakarta-tomcat4/files/tomcatctl +++ b/www/jakarta-tomcat4/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 diff --git a/www/jakarta-tomcat41/files/tomcatctl b/www/jakarta-tomcat41/files/tomcatctl index a28cac7623a2..9992f023380b 100644 --- a/www/jakarta-tomcat41/files/tomcatctl +++ b/www/jakarta-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 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 |