From 7a0bf029963bde94b6b841fb79b8213cbb3d6ae2 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Date: Tue, 21 Aug 2012 15:07:37 +0100
Subject: More fixes for Debian-style build

---
 lua.morph    | 2 +-
 src/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua.morph b/lua.morph
index b52d726..49332d8 100644
--- a/lua.morph
+++ b/lua.morph
@@ -6,7 +6,7 @@
         "sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile"
     ],
     "build-commands": [
-        "make debian_linux INSTALL_TOP=\"$PREFIX\""
+        "make debian_linux INSTALL_TOP=\"$PREFIX\" RPATH=\"$PREFIX/lib\""
     ],
     "install-commands": [
         "make INSTALL_TOP=\"$DESTDIR/$PREFIX\" debian_install"
diff --git a/src/Makefile b/src/Makefile
index 05f4b2a..b4c4286 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -189,7 +189,7 @@ LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
 
 $(LIB_NAME) $(LIB_NAME:.la=.a): $(LIB_OBJS)
 	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-	    -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
+	    -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
 
 lua$(V): $(LUA_O) $(LIB_NAME)
 	$(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) $(LDFLAGS)
-- 
cgit v1.2.1