diff options
| author | Sven Gothel <[email protected]> | 2014-06-17 01:15:13 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-17 01:15:13 +0200 |
| commit | 56a22f2937c334320637557ef6cd9b38c4b03022 (patch) | |
| tree | f83757cbd381e46c3604571885a059801fbc9d50 /make | |
| parent | d3e2cd6432b3383d4589350d60170e02db469343 (diff) | |
Minor edits: space, final qualifier; setenv-build-*: Add generic JDK location
Diffstat (limited to 'make')
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86.sh | 12 | ||||
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86_64.sh | 13 |
2 files changed, 25 insertions, 0 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh index f035a4a..ce055ba 100644 --- a/make/scripts/setenv-build-jogl-x86.sh +++ b/make/scripts/setenv-build-jogl-x86.sh @@ -68,6 +68,18 @@ if [ -z "$FOUND_JAVA" ] ; then fi fi +if [ -z "$FOUND_JAVA" ] ; then + # make a symbolic link, e.g. OpenJDK: + # /usr/lib/jvm/java-7-openjdk-i386 -> /usr/lib/jvm/java-i386 + if [ -e /usr/lib/jvm/java-i386 ] ; then + J2RE_HOME=/usr/lib/jvm/java-i386/jre + JAVA_HOME=/usr/lib/jvm/java-i386 + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi +fi + export PATH echo FOUND_JAVA $FOUND_JAVA diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh index 8994365..a18bbe0 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogl-x86_64.sh @@ -79,6 +79,19 @@ if [ -z "$FOUND_JAVA" ] ; then fi fi +if [ -z "$FOUND_JAVA" ] ; then + # make a symbolic link, e.g. OpenJDK: + # /usr/lib/jvm/java-7-openjdk-amd64 -> /usr/lib/jvm/java-amd64 + if [ -e /usr/lib/jvm/java-amd64 ] ; then + J2RE_HOME=/usr/lib/jvm/java-amd64/jre + JAVA_HOME=/usr/lib/jvm/java-amd64 + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi +fi + + export PATH echo FOUND_JAVA $FOUND_JAVA |