diff options
| author | Francois Perrad <fperrad@gmail.com> | 2014-01-11 16:42:05 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-01-13 23:16:18 +0100 |
| commit | ccd68a513fc155578b724d629d61f1a9686547ee (patch) | |
| tree | 2af7ce47b0099e24e4ea62b39c161f0f4d4579eb /package/lua | |
| parent | 443f8c1f4d394c94731a333e26ab523f0fb84abc (diff) | |
| download | buildroot-ccd68a513fc155578b724d629d61f1a9686547ee.tar.gz buildroot-ccd68a513fc155578b724d629d61f1a9686547ee.zip | |
lua*: restore version in module paths
(like in upstream)
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/lua')
| -rw-r--r-- | package/lua/lua-01-root-path.patch | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/package/lua/lua-01-root-path.patch b/package/lua/lua-01-root-path.patch index f82c9c5f0e..fd0da6eb57 100644 --- a/package/lua/lua-01-root-path.patch +++ b/package/lua/lua-01-root-path.patch @@ -1,5 +1,4 @@ Adjust installation location to /usr. -Remove version in module paths. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> @@ -7,7 +6,7 @@ Index: b/etc/lua.pc =================================================================== --- a/etc/lua.pc +++ b/etc/lua.pc -@@ -8,13 +8,13 @@ +@@ -8,7 +8,7 @@ R= 5.1.5 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' @@ -16,28 +15,16 @@ Index: b/etc/lua.pc INSTALL_BIN= ${prefix}/bin INSTALL_INC= ${prefix}/include INSTALL_LIB= ${prefix}/lib - INSTALL_MAN= ${prefix}/man/man1 --INSTALL_LMOD= ${prefix}/share/lua/${V} --INSTALL_CMOD= ${prefix}/lib/lua/${V} -+INSTALL_LMOD= ${prefix}/share/lua -+INSTALL_CMOD= ${prefix}/lib/lua - - # canonical vars - exec_prefix=${prefix} Index: b/src/luaconf.h =================================================================== --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -94,9 +94,9 @@ +@@ -94,7 +94,7 @@ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" #else -#define LUA_ROOT "/usr/local/" --#define LUA_LDIR LUA_ROOT "share/lua/5.1/" --#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" +#define LUA_ROOT "/usr/" -+#define LUA_LDIR LUA_ROOT "share/lua/" -+#define LUA_CDIR LUA_ROOT "lib/lua/" + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_PATH_DEFAULT \ - "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua" |
