mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-14 07:43:32 +08:00
641f5dcb76
Use a patch rather than sed'ing files in the build process. Signed-off-by: Francois Perrad <fperrad@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
Adjust installation location to /usr.
|
|
Remove version in module paths.
|
|
|
|
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
|
|
|
Index: b/etc/lua.pc
|
|
===================================================================
|
|
--- a/etc/lua.pc
|
|
+++ b/etc/lua.pc
|
|
@@ -8,13 +8,13 @@
|
|
R= 5.1.5
|
|
|
|
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
|
|
-prefix= /usr/local
|
|
+prefix= /usr
|
|
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 @@
|
|
".\\?.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_PATH_DEFAULT \
|
|
"./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
|
|
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
|