$NetBSD: patch-bin_apollo,v 1.1 2012/08/15 10:11:28 imil Exp $

Various fixes regarding expected PATHs

--- bin/apollo.orig	2012-07-31 17:36:24.000000000 +0000
+++ bin/apollo
@@ -29,6 +29,9 @@ else
   fi
 fi
 
+JAVA_HOME="@JAVA_HOME@"
+PATH=$PATH:$JAVA_HOME/bin
+
 # OS specific support.
 cygwin=false;
 darwin=false;
@@ -62,11 +65,11 @@ if [ -z "$APOLLO_HOME" ] ; then
     fi
   done
 
-  APOLLO_HOME=`dirname "$PRG"`
+  APOLLO_HOME="@APOLLO_HOME@"
   cd "$saveddir"
 
   # make it fully qualified
-  APOLLO_HOME=`cd "$APOLLO_HOME/.." && pwd`
+  # APOLLO_HOME=`cd "$APOLLO_HOME/.." && pwd`
 fi
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
@@ -101,11 +104,11 @@ if [ ! -x "$JAVACMD" ] ; then
   exit 1
 fi
 
-CLASSPATH="${APOLLO_HOME}/lib/apollo-boot.jar"
+CLASSPATH="${APOLLO_HOME}/lib/apollo/apollo-boot.jar"
 
-BOOTDIRS="${APOLLO_HOME}/lib"
+BOOTDIRS="${APOLLO_HOME}/lib/apollo"
 if [ ! -z "$APOLLO_BASE" ] ; then
-  BOOTDIRS="${APOLLO_BASE}/lib:${BOOTDIRS}"
+  BOOTDIRS="${APOLLO_BASE}/lib/apollo:${BOOTDIRS}"
 fi
 
 # For Cygwin, switch paths to Windows format before running java