From 9d910cf21fb8a61e3a1604f6258364c3b725964d Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@phalanx.goethel.localnet>
Date: Thu, 9 Jul 2009 12:01:08 -0700
Subject: Make build scripts independent from setenv scripts

---
 make/make.jogl.all.linux-x86.sh    | 5 ++++-
 make/make.jogl.all.linux-x86_64.sh | 4 +++-
 make/make.jogl.all.macosx.sh       | 5 ++++-
 make/make.jogl.cdcfp.linux-x86.sh  | 4 +++-
 make/make.jogl.doc.all.x86_64.sh   | 5 ++++-
 make/make.jogl.doc.x86_64.sh       | 5 ++++-
 6 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'make')

diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index bb2f060ca..4eec0b317 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-. ../../setenv-build-jogl-x86.sh
+if [ -e ../../setenv-build-jogl-x86.sh ] ; then
+    . ../../setenv-build-jogl-x86.sh
+fi
+
 
 # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64
 #    -Dc.compiler.debug=true 
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index 1d9cf68fa..b9e1d1789 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -1,6 +1,8 @@
 #! /bin/sh
 
-. ../../setenv-build-jogl-x86_64.sh
+if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
+    . ../../setenv-build-jogl-x86_64.sh
+fi
 
 # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64
 #    -Dc.compiler.debug=true 
diff --git a/make/make.jogl.all.macosx.sh b/make/make.jogl.all.macosx.sh
index e00cd83b6..a85f9344f 100644
--- a/make/make.jogl.all.macosx.sh
+++ b/make/make.jogl.all.macosx.sh
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-. /devtools/etc/profile.ant
+if [ -e /devtools/etc/profile.ant ] ; then
+    . /devtools/etc/profile.ant
+fi
+
 
 #    -Dc.compiler.debug=true 
 #    -Dbuild.noarchives=true
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index 786f1a0b2..86fc2cc8b 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -1,6 +1,8 @@
 #! /bin/sh
 
-. ../../setenv-build-jogl.sh
+if [ -e ../../setenv-build-jogl-x86.sh ] ; then
+    . ../../setenv-build-jogl-x86.sh
+fi
 
 #    -Dc.compiler.debug=true 
 #
diff --git a/make/make.jogl.doc.all.x86_64.sh b/make/make.jogl.doc.all.x86_64.sh
index 1af2b90e5..3711171af 100644
--- a/make/make.jogl.doc.all.x86_64.sh
+++ b/make/make.jogl.doc.all.x86_64.sh
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-. ../../setenv-build-jogl-x86_64.sh
+if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
+    . ../../setenv-build-jogl-x86_64.sh
+fi
+
 
 ant -v  \
     -Dbuild.noarchives=true \
diff --git a/make/make.jogl.doc.x86_64.sh b/make/make.jogl.doc.x86_64.sh
index 99001d27c..daf09ec33 100644
--- a/make/make.jogl.doc.x86_64.sh
+++ b/make/make.jogl.doc.x86_64.sh
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-. ../../setenv-build-jogl-x86_64.sh
+if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
+    . ../../setenv-build-jogl-x86_64.sh
+fi
+
 
 ant -v  \
     -Dbuild.noarchives=true \
-- 
cgit v1.2.3