Merge ssh://ssh.dcc.fc.up.pt:31064/home/vsc/github/yap-6.3

packages/python/swig/prolog/yapi.yap

@@ -2,10 +2,6 @@
 %% @brief support yap shell
 %%
 
-:- yap_flag(verbose, verbose).
-
-:- use_module( library(python) ).
-
 :- module(yapi, [
 		 python_ouput/0,
 		 show_answer/2,
@@ -15,12 +11,16 @@
 		 yapi_query/2
 		 ]).
 
+
+     :- yap_flag(verbose, verbose).
+
+
 :- use_module( library(lists) ).
 :- use_module( library(maplist) ).
 :- use_module( library(rbtrees) ).
 :- use_module( library(terms) ).
 :- reexport( library(python) ).
-
+w
 :- python_import(yap4py.yapi).
 
 %:- start_low_level_trace.

packages/python/swig/setup.py.in

@@ -68,7 +68,7 @@ elif platform.system() == 'Darwin':
     win_libs = []
     local_libs = ['Py4YAP']
 elif platform.system() == 'Linux':
-    my_extra_link_args = ['-L','..']
+    my_extra_link_args = ['-L','..','-Wl,-rpath','-Wl,${CMAKE_INSTALL_FULL_LIBDIR}']
     win_libs = []
     local_libs = ['Py4YAP']