X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=contrib%2Fsetenvsource.in;h=377599afef535bb0f33de7bea23f6ad0d2db964c;hb=HEAD;hp=4c94da51f1328b0c472759a4a070354a45c85671;hpb=79a48298d2001c879a3e22c9602736a569e5009b;p=cacao.git

diff --git a/contrib/setenvsource.in b/contrib/setenvsource.in
index 4c94da51f..377599afe 100644
--- a/contrib/setenvsource.in
+++ b/contrib/setenvsource.in
@@ -1,15 +1,17 @@
-# sets the environment variables when GNU classpath and CACAO are not
-# installed
+# Sets the environment variables properly when GNU Classpath and CACAO
+# are not installed.
+
+export PATH=$PWD/src/cacao:$PATH
 
 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:\
+$PWD/src/cacao/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/native/jawt/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/native/jni/gtk-peer/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/native/jni/java-io/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/native/jni/java-lang/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/native/jni/java-net/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/native/jni/java-nio/.libs:\
+@JAVA_RUNTIME_LIBRARY_PREFIX@/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
+export BOOTCLASSPATH=$PWD/src/classes/vm.zip:@JAVA_RUNTIME_LIBRARY_CLASSES@