summaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-build-jogl-x86.sh
diff options
context:
space:
mode:
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86.sh')
-rw-r--r--make/scripts/setenv-build-jogl-x86.sh22
1 files changed, 16 insertions, 6 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index 5e4e542..5c7bf65 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -19,12 +19,22 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-if [ -e /opt-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then
- J2RE_HOME=/opt-linux-x86/jre8
- JAVA_HOME=/opt-linux-x86/j2se8
- PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
- export J2RE_HOME JAVA_HOME
- FOUND_JAVA=1
+if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
+ if [ -e $J2RE_HOME -a -e $JAVA_HOME ] ; then
+ 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-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then
+ J2RE_HOME=/opt-linux-x86/jre8
+ JAVA_HOME=/opt-linux-x86/j2se8
+ PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+ export J2RE_HOME JAVA_HOME
+ FOUND_JAVA=1
+ fi
fi
if [ -z "$FOUND_JAVA" ] ; then