aboutsummaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-build-jogl-x86_64.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-07-04 20:20:35 +0200
committerSven Gothel <[email protected]>2013-07-04 20:20:35 +0200
commit3ceb32fb505363ccc02fc4cce1362257ca98a3e5 (patch)
tree856b7d0a7fc0777fe5b1feffaa3b4107cbdc1eca /make/scripts/setenv-build-jogl-x86_64.sh
parent64dcc55a0aadee4ef824cc145e936cd7bc3c1bdd (diff)
Scripts: Fix setenv for open-solaris/indiana/Illumus ..
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86_64.sh')
-rw-r--r--make/scripts/setenv-build-jogl-x86_64.sh16
1 files changed, 12 insertions, 4 deletions
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