Patchwork [1/1] ljsyscall: move installation path to /usr/share/lua/5x

login
register
mail settings
Submitter Danomi Manchego
Date Jan. 31, 2014, 2:29 a.m.
Message ID <1391135391-1953-1-git-send-email-danomimanchego123@gmail.com>
Download mbox | patch
Permalink /patch/315503/
State Accepted
Headers show

Comments

Danomi Manchego - Jan. 31, 2014, 2:29 a.m.
Move ljsyscall install destination to /usr/share/lua/$(abiver}, to
match what the luarocks install would naturally do.  This also
reflects the value of INSTALL_LMOD in the luajit.pc file.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
 package/ljsyscall/ljsyscall.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Francois Perrad - March 2, 2014, 8:30 a.m.
2014-01-31 3:29 GMT+01:00 Danomi Manchego <danomimanchego123@gmail.com>:
> Move ljsyscall install destination to /usr/share/lua/$(abiver}, to
> match what the luarocks install would naturally do.  This also
> reflects the value of INSTALL_LMOD in the luajit.pc file.
>
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

Tested-by: Francois Perrad <francois.perrad@gadz.org>

> ---
>  package/ljsyscall/ljsyscall.mk |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/ljsyscall/ljsyscall.mk b/package/ljsyscall/ljsyscall.mk
> index 1f36dc7..cc49890 100644
> --- a/package/ljsyscall/ljsyscall.mk
> +++ b/package/ljsyscall/ljsyscall.mk
> @@ -19,7 +19,7 @@ else ifeq ($(LJSYSCALL_ARCH),)
>  LJSYSCALL_ARCH = $(BR2_ARCH)
>  endif
>
> -LJSYSCALL_TARGET_DIR = $(TARGET_DIR)/usr/share/luajit-$(LUAJIT_VERSION)
> +LJSYSCALL_TARGET_DIR = $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)
>
>  define LJSYSCALL_INSTALL_TARGET_CMDS
>         $(INSTALL) -d $(LJSYSCALL_TARGET_DIR)/syscall
> --
> 1.7.9.5
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni - March 6, 2014, 10:09 p.m.
Dear Danomi Manchego,

On Thu, 30 Jan 2014 21:29:51 -0500, Danomi Manchego wrote:
> Move ljsyscall install destination to /usr/share/lua/$(abiver}, to
> match what the luarocks install would naturally do.  This also
> reflects the value of INSTALL_LMOD in the luajit.pc file.
> 
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
> ---
>  package/ljsyscall/ljsyscall.mk |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

Patch

diff --git a/package/ljsyscall/ljsyscall.mk b/package/ljsyscall/ljsyscall.mk
index 1f36dc7..cc49890 100644
--- a/package/ljsyscall/ljsyscall.mk
+++ b/package/ljsyscall/ljsyscall.mk
@@ -19,7 +19,7 @@  else ifeq ($(LJSYSCALL_ARCH),)
 LJSYSCALL_ARCH = $(BR2_ARCH)
 endif
 
-LJSYSCALL_TARGET_DIR = $(TARGET_DIR)/usr/share/luajit-$(LUAJIT_VERSION)
+LJSYSCALL_TARGET_DIR = $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)
 
 define LJSYSCALL_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(LJSYSCALL_TARGET_DIR)/syscall