diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-08-21 15:07:37 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-08-21 15:07:37 +0100 |
| commit | 7a0bf029963bde94b6b841fb79b8213cbb3d6ae2 (patch) | |
| tree | a335e89104fd1c6135f2703480c305a7bd9c4df4 | |
| parent | 5af1a482eaf75f0930ce7f9b8fca96e13db9c79e (diff) | |
| download | lua-7a0bf029963bde94b6b841fb79b8213cbb3d6ae2.tar.gz | |
More fixes for Debian-style build
| -rw-r--r-- | lua.morph | 2 | ||||
| -rw-r--r-- | src/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) |