diff mbox

[1/1] libuci: correct lua path

Message ID 1455023857-27794-1-git-send-email-Neha.Bairathi@imgtec.com
State Accepted
Headers show

Commit Message

Neha Bairathi Feb. 9, 2016, 1:17 p.m. UTC
LUAPATH is used as the path for installing lua binding.
As buildroot specifies the install prefix, STAGING_DIR gets
appended to TARGET_DIR which is incorrect path for installation,
so use relative path.

Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
Reviewed-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Signed-off-by: Neha Bairathi <Neha.Bairathi@imgtec.com>
---
 package/libuci/libuci.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arnout Vandecappelle Feb. 9, 2016, 9:53 p.m. UTC | #1
On 09-02-16 14:17, Neha Bairathi wrote:
> LUAPATH is used as the path for installing lua binding.
> As buildroot specifies the install prefix, STAGING_DIR gets
> appended to TARGET_DIR which is incorrect path for installation,
> so use relative path.
> 
> Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
> Reviewed-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
> Signed-off-by: Neha Bairathi <Neha.Bairathi@imgtec.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Checked that it is only used to set the INSTALL command's DESTINATION argument,
and that means that DESTDIR will indeed be prefixed to it.

 Regards,
 Arnout

> ---
>  package/libuci/libuci.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
> index a78048d..8c060d5 100644
> --- a/package/libuci/libuci.mk
> +++ b/package/libuci/libuci.mk
> @@ -13,7 +13,7 @@ LIBUCI_DEPENDENCIES = libubox
>  ifeq ($(BR2_PACKAGE_LUA_5_1),y)
>  LIBUCI_DEPENDENCIES += lua
>  LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \
> -	-DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
> +	-DLUAPATH=/usr/lib/lua/5.1 \
>  	-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
>  else
>  LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
>
Thomas Petazzoni Feb. 23, 2016, 10:45 p.m. UTC | #2
Dear Neha Bairathi,

On Tue, 9 Feb 2016 18:47:37 +0530, Neha Bairathi wrote:
> LUAPATH is used as the path for installing lua binding.
> As buildroot specifies the install prefix, STAGING_DIR gets
> appended to TARGET_DIR which is incorrect path for installation,
> so use relative path.
> 
> Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
> Reviewed-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
> Signed-off-by: Neha Bairathi <Neha.Bairathi@imgtec.com>
> ---
>  package/libuci/libuci.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks. Thanks Arnout for reviewing.

Thomas
diff mbox

Patch

diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
index a78048d..8c060d5 100644
--- a/package/libuci/libuci.mk
+++ b/package/libuci/libuci.mk
@@ -13,7 +13,7 @@  LIBUCI_DEPENDENCIES = libubox
 ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 LIBUCI_DEPENDENCIES += lua
 LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \
-	-DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
+	-DLUAPATH=/usr/lib/lua/5.1 \
 	-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
 else
 LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF