More rpath tweaks

diff --git a/Makefile b/Makefile
index cb5499be9991b7237caf8e98a0615e040ce0d9e4..09e29097422d6e8a45113ca02efc9cc6f83f46c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ SOURCE   = $(BASENAME).c
 
 LDFLAGS += -shared
 LDFLAGS += -Llib
-LDFLAGS += -Wl,-rpath,lib
+LDFLAGS += -Wl,-rpath,$(CURRENT_DIR)/lib
 LDFLAGS += -lswipl
 
 CFLAGS  += -fPIC
@@ -26,6 +26,7 @@ CFLAGS  += -O2
 CFLAGS  += -Ilib/swipl/include
 
 CMAKE_OPTIONS += -DCMAKE_INSTALL_PREFIX=$(CURRENT_DIR)
+CMAKE_OPTIONS += -DCMAKE_INSTALL_RPATH=$(CURRENT_DIR)/lib
 CMAKE_OPTIONS += -DUSE_GMP=OFF
 CMAKE_OPTIONS += -DSWIPL_PACKAGES_ODBC=OFF
 CMAKE_OPTIONS += -DSWIPL_PACKAGES_JAVA=OFF