From 56a22f2937c334320637557ef6cd9b38c4b03022 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 17 Jun 2014 01:15:13 +0200
Subject: Minor edits: space, final qualifier; setenv-build-*: Add generic JDK
 location

---
 make/scripts/setenv-build-jogl-x86.sh    | 12 ++++++++++++
 make/scripts/setenv-build-jogl-x86_64.sh | 13 +++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'make')

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
-- 
cgit v1.2.3