diff options
| author | Sven Gothel <[email protected]> | 2013-06-15 05:27:51 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-15 05:27:51 +0200 |
| commit | d01cb422c4621fbc1b5ea2bcd7d19f3ff8602715 (patch) | |
| tree | 769518d62bc409191667355a924e559e9ab52770 /make/scripts/setenv-build-jogl-x86_64.sh | |
| parent | a7802a2ab90a68ecbba962149a335f975fce24e7 (diff) | |
Fix CStruct APT File Location - Threw FileNotFoundException w/ Java7
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86_64.sh')
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86_64.sh | 4 |
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 |