X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-tomcat.git;a=blobdiff_plain;f=jakarta-tomcat-JAVA_HOME.patch;h=8bae964d142c4fb442649c487700cc20dcf2209b;hp=4e98792621617fc02cac46236eaa2e9582921aaa;hb=refs%2Fheads%2Fmaster;hpb=0bb56dc40ec9b350d93538407c63744f2deef486

diff --git a/jakarta-tomcat-JAVA_HOME.patch b/jakarta-tomcat-JAVA_HOME.patch
index 4e98792..8bae964 100644
--- a/jakarta-tomcat-JAVA_HOME.patch
+++ b/jakarta-tomcat-JAVA_HOME.patch
@@ -12,6 +12,23 @@ diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/catalina.sh jakarta-tomc
  # ----- Execute The Requested Command -----------------------------------------
  
  echo "Using CATALINA_BASE:   $CATALINA_BASE"
+diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh
+--- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh	Tue Nov 26 22:37:05 2002
++++ jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh	Tue Nov 26 23:05:50 2002
+@@ -6,9 +6,13 @@
+ 
+ # Make sure prerequisite environment variables are set
+ if [ -z "$JAVA_HOME" ]; then
++  if [ -x /usr/lib/java/bin/java ]; then
++    JAVA_HOME=/usr/lib/java
++  else
+   echo "The JAVA_HOME environment variable is not defined"
+   echo "This environment variable is needed to run this program"
+   exit 1
++  fi
+ fi
+ if [ ! -r "$JAVA_HOME"/bin/java ]; then
+   echo "The JAVA_HOME environment variable is not defined correctly"
 diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh
 --- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh	Tue Nov 26 22:37:05 2002
 +++ jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh	Tue Nov 26 22:53:07 2002