Blob Blame History Raw
diff -ur pl-5.6.52/packages/jpl.orig/jpl.pl pl-5.6.52/packages/jpl/jpl.pl
--- pl-5.6.52/packages/jpl.orig/jpl.pl	2008-03-12 20:33:08.000000000 +0100
+++ pl-5.6.52/packages/jpl/jpl.pl	2008-04-08 14:47:59.000000000 +0200
@@ -4390,7 +4390,8 @@
 :- multifile user:file_search_path/2.
 :- dynamic   user:file_search_path/2.
 
-user:file_search_path(jar, swi(lib)).
+user:file_search_path(jar, 'LIBDIR/pl-jpl').
+user:file_search_path(jni, 'LIBDIR/pl-jpl').
 
 %%	add_search_path(+Var, +Value) is det.
 %
@@ -4534,7 +4535,7 @@
 
 libjpl(File) :-
 	(   current_prolog_flag(unix, true)
-	->  File = foreign(libjpl)
+	->  File = jni(libjpl)
 	;   File = foreign(jpl)
 	).
 
diff -ur pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java
--- pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java	2008-03-12 20:33:08.000000000 +0100
+++ pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java	2008-04-08 14:17:08.000000000 +0200
@@ -79,7 +79,7 @@
  */
 public final class Prolog {
 	static {
-		System.loadLibrary("jpl");
+		System.load("LIBDIR/pl-jpl/libjpl.so");
 	}
 
 	/* term types */