Load libguilexapian without any specific path.

* pre-inst-env.in (LD_LIBRARY_PATH): Set LD_LIBRARY_PATH.
* xapian.i: Load libguilexapian without any specific path. Let it be found
using LD_LIBRARY_PATH and other search mechanisms.

2 files changed, 3 insertions, 2 deletions

diff --git a/pre-inst-env.in b/pre-inst-env.in
index c0c694f..f15728e 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -24,6 +24,7 @@ abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd -P`"
 
 GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
 GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
-export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
+LD_LIBRARY_PATH="$abs_top_builddir"
+export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH LD_LIBRARY_PATH
 
 exec "$@"
diff --git a/xapian.i b/xapian.i
index 54f8c0e..9c1a347 100644
--- a/xapian.i
+++ b/xapian.i
@@ -24,7 +24,7 @@
 
 %scheme
 %{
-(load-extension "./libguilexapian" "SWIG_init")
+(load-extension "libguilexapian" "SWIG_init")
 %}
 
 %include xapian-head.i