summaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-build-jogl-x86_64.sh
diff options
context:
space:
mode:
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86_64.sh')
-rw-r--r--make/scripts/setenv-build-jogl-x86_64.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 9c7d674..6b2a66e 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -31,9 +31,7 @@ if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then
JAVA_HOME=/opt-linux-x86_64/j2se6
PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
export J2RE_HOME JAVA_HOME
-fi
-
-if [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
+elif [ -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