* debugSetPathes: Removed.

* setenvinstalled, setenvsource: Added, set the environment variables for
  both cases: GNU classpath and CACAO not installed (setenvsource) and
  GNU classpath installed, but CACAO's not (setenvinstalled).

diff --git a/contrib/.cvsignore b/contrib/.cvsignore
index 282522db0342d8750454b3dc162493b5fc709cc8..d573a97250d2190ecbf8fb2b2fe74de052cfb997 100644 (file)
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+setenvinstalled
+setenvsource

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 3bc2d3d93f162898a122728239004e1414a84a0e..0d1a641d436710bde810e4f50bc3af254192069f 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3294 2005-09-28 14:01:22Z twisti $
+## $Id: Makefile.am 3318 2005-09-30 11:16:47Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-noinst_DATA = debugSetPathes
+noinst_DATA = \
+       setenvinstalled.in \
+       setenvsource.in
 
 ## Local variables:
 ## mode: Makefile

diff --git a/contrib/debugSetPathes b/contrib/debugSetPathes
deleted file mode 100644 (file)
index b1a8f2e..0000000
--- a/contrib/debugSetPathes
+++ /dev/null
@@ -1,9 +0,0 @@
-export LD_LIBRARY_PATH=$PWD/src/classpath/native/jni/java-lang/.libs:$PWD/src/classpath/native/jni/java-io/.libs:$PWD/src/classpath/native/jni/java-nio/.libs:\
-$PWD/src/classpath/native/jni/java-util/.libs:$PWD/src/classpath/native/jni/java-awt/.libs:$PWD/src/classpath/native/jni/gtk-peer/.libs:\
-$PWD/src/classpath/native/jni/java-io/.libs:$PWD/src/classpath/native/jni/classpath/.libs:\
-$PWD/src/classpath/native/jni/java-net/.libs:$LD_LIBRARY_PATH
-
-export BOOTCLASSPATH=$PWD/src/classpath/lib/rt.jar
-
-export PATH=$PWD/src/cacao:$PATH
-

diff --git a/contrib/setenvinstalled.in b/contrib/setenvinstalled.in
new file mode 100644 (file)
index 0000000..2001be7
--- /dev/null
+++ b/contrib/setenvinstalled.in
@@ -0,0 +1,5 @@
+# sets the environment variables when GNU classpath is installed, but
+# CACAO not
+
+export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_INSTALL_DIR@/share/classpath/glibj.zip
+export PATH=$PWD/src/cacao:$PATH

diff --git a/contrib/setenvsource.in b/contrib/setenvsource.in
new file mode 100644 (file)
index 0000000..4c94da5
--- /dev/null
+++ b/contrib/setenvsource.in
@@ -0,0 +1,15 @@
+# sets the environment variables when GNU classpath and CACAO are not
+# installed
+
+export LD_LIBRARY_PATH=\
+@CLASSPATH_INSTALL_DIR@/native/jawt/.libs:\
+@CLASSPATH_INSTALL_DIR@/native/jni/gtk-peer/.libs:\
+@CLASSPATH_INSTALL_DIR@/native/jni/java-io/.libs:\
+@CLASSPATH_INSTALL_DIR@/native/jni/java-lang/.libs:\
+@CLASSPATH_INSTALL_DIR@/native/jni/java-net/.libs:\
+@CLASSPATH_INSTALL_DIR@/native/jni/java-nio/.libs:\
+@CLASSPATH_INSTALL_DIR@/native/jni/java-util/.libs:\
+$LD_LIBRARY_PATH
+
+export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_INSTALL_DIR@/lib/glibj.zip
+export PATH=$PWD/src/cacao:$PATH