4 files changed, 15 insertions, 29 deletions
diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh
index b81cf79f6..b79fffe33 100755
--- a/make/scripts/make.jogl.all.linux-x86.sh
+++ b/make/scripts/make.jogl.all.linux-x86.sh
@@ -1,19 +1,9 @@
 #! /bin/sh
 
-if [ -e ../../setenv-build-jogl-x86.sh ] ; then
-    . ../../setenv-build-jogl-x86.sh
-fi
+SDIR=`dirname $0` 
 
-if [ -z "$ANT_PATH" ] ; then
-    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
-        ANT_PATH=/usr/share/ant
-        export ANT_PATH
-        echo autosetting ANT_PATH to $ANT_PATH
-    fi
-fi
-if [ -z "$ANT_PATH" ] ; then
-    echo ANT_PATH does not exist, set it
-    exit
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
 fi
 
 if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 3ae48f598..6fe80312b 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -1,15 +1,9 @@
 #! /bin/sh
 
-if [ -z "$ANT_PATH" ] ; then
-    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
-        ANT_PATH=/usr/share/ant
-        export ANT_PATH
-        echo autosetting ANT_PATH to $ANT_PATH
-    fi
-fi
-if [ -z "$ANT_PATH" ] ; then
-    echo ANT_PATH does not exist, set it
-    exit
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
 if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.doc.all.x86_64.sh b/make/scripts/make.jogl.doc.all.x86_64.sh
index 5e111d50b..d75f5b0e4 100755
--- a/make/scripts/make.jogl.doc.all.x86_64.sh
+++ b/make/scripts/make.jogl.doc.all.x86_64.sh
@@ -1,9 +1,10 @@
 #! /bin/sh
 
-if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
-    . ../../setenv-build-jogl-x86_64.sh
-fi
+SDIR=`dirname $0` 
 
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
 
 ant -v  \
     -Drootrel.build=build-x86_64 \
diff --git a/make/scripts/make.jogl.doc.x86_64.sh b/make/scripts/make.jogl.doc.x86_64.sh
index 677de394c..028a5d995 100755
--- a/make/scripts/make.jogl.doc.x86_64.sh
+++ b/make/scripts/make.jogl.doc.x86_64.sh
@@ -1,9 +1,10 @@
 #! /bin/sh
 
-if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
-    . ../../setenv-build-jogl-x86_64.sh
-fi
+SDIR=`dirname $0` 
 
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
 
 ant -v  \
     -Drootrel.build=build-x86_64 \