2 files changed, 30 insertions, 4 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index d203c09..f035a4a 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -38,6 +38,17 @@ if [ -z "$FOUND_JAVA" ] ; then
 fi 
 
 if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /usr/java/jre/bin -a -e /usr/java/bin ] ; then
+        # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
+        # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
+        J2RE_HOME=/usr/java/jre
+        JAVA_HOME=/usr/java
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi
+fi
+if [ -z "$FOUND_JAVA" ] ; then
     if [ -e /opt-solaris-x86/jre7 -a -e /opt-solaris-x86/j2se7 ] ; then
         J2RE_HOME=/opt-solaris-x86/jre7
         JAVA_HOME=/opt-solaris-x86/j2se7
@@ -59,3 +70,10 @@ fi
 
 export PATH
 
+echo FOUND_JAVA $FOUND_JAVA
+echo J2RE_HOME $J2RE_HOME
+echo JAVA_HOME $JAVA_HOME
+echo PATH $PATH
+which java
+java -version
+
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 7b71378..c0746e9 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -48,10 +48,12 @@ if [ -z "$FOUND_JAVA" ] ; then
     if [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
         # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
         # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
-        J2RE_HOME=/usr/java/jre/bin/amd64
-        JAVA_HOME=/usr/java/bin/amd64
-        PATH=$J2RE_HOME:$JAVA_HOME:$PATH
-        export J2RE_HOME JAVA_HOME
+        J2RE_HOME=/usr/java/jre
+        JAVA_HOME=/usr/java
+        PATH=$J2RE_HOME/bin/amd64:$JAVA_HOME/bin/amd64:$PATH
+        JAVACMD=$JAVA_HOME/bin/amd64/java
+        ANT_OPTS="-d64 -DjvmJava.exe=$J2RE_HOME/bin/amd64/java"
+        export J2RE_HOME JAVA_HOME JAVACMD ANT_OPTS
         FOUND_JAVA=1
     fi
 fi
@@ -69,4 +71,10 @@ fi
 
 export PATH
 
+echo FOUND_JAVA $FOUND_JAVA
+echo J2RE_HOME $J2RE_HOME
+echo JAVA_HOME $JAVA_HOME
+echo PATH $PATH
+which java
+java -version