summaryrefslogtreecommitdiff
path: root/packages/cacao/files/cacao-0.98+svn-libdir.diff
blob: f5cf9ba5a10b51f14562c9408122349568a9e906 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Index: cacao-trunk/src/vm/properties.c
===================================================================
--- cacao-trunk.orig/src/vm/properties.c	2007-08-31 13:20:41.000000000 +0200
+++ cacao-trunk/src/vm/properties.c	2007-09-04 14:54:19.000000000 +0200
@@ -210,15 +210,22 @@
 
 # if defined(WITH_CLASSPATH_GNU)
 
-	boot_library_path = CLASSPATH_LIBDIR"/classpath";
+	boot_library_path = CLASSPATH_LIBDIR"/classpath:OE_LIBDIR_JNI";
 
 # elif defined(WITH_CLASSPATH_SUN)
 
-	boot_library_path = CLASSPATH_LIBDIR;
+	boot_library_path = CLASSPATH_LIBDIR":OE_LIBDIR_JNI";
 
 # elif defined(WITH_CLASSPATH_CLDC1_1)
 
-	/* No boot_library_path required. */
+	/* No boot_library_path required.
+           Well, don't be that strict on Debian-like
+           environments. Setting this to /usr/lib/jni
+           makes it unneccessary to fumble with
+           LD_LIBRARY_PATH to get things like MIDPath
+           running.
+        */
+	boot_library_path = "OE_LIBDIR_JNI";
 
 # else
 #  error unknown classpath configuration