[grilo-plugins] lua-factory: Fix lua sources path with Meson



commit 24e12ef1cb1a855b7b0d2e88ec244d8e2ab83470
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Apr 14 16:21:29 2017 +0200

    lua-factory: Fix lua sources path with Meson
    
    lua-factory was trying to find lua sources in:
    ~/.local/share/share/grilo-plugins/grl-lua-factory
    amongst other directories with duplicated "share" components.
    
    luafactorydir is used to pass "LUA_FACTORY_SOURCE_LOCATION" as a define,
    but it has a value of "grilo-plugins/${LUA_FACTORY_PLUGIN_ID}" when
    using autotools, without a "datadir" component.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781318

 src/lua-factory/meson.build |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/lua-factory/meson.build b/src/lua-factory/meson.build
index cfdb7f6..b6e8a89 100644
--- a/src/lua-factory/meson.build
+++ b/src/lua-factory/meson.build
@@ -45,7 +45,7 @@ lua_library_sources += [ htmlentity_c ]
 configure_file(output: 'config.h',
     configuration: cdata)
 
-luafactorydir = join_paths(get_option('datadir'), 'grilo-plugins', 'grl-lua-factory')
+luafactorydir = join_paths('grilo-plugins', 'grl-lua-factory')
 
 shared_library('grlluafactory',
     sources: lua_factory_sources + lua_factory_resources + lua_library_sources,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]