[grilo-plugins] meson: Search lua-factory sources to correct dir
- From: Victor Toso <victortoso src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] meson: Search lua-factory sources to correct dir
- Date: Mon, 23 Jul 2018 20:07:45 +0000 (UTC)
commit f88ec4080ffa14384a325dcb9f8d7e2c6c220565
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Tue Jul 17 22:17:52 2018 +0000
meson: Search lua-factory sources to correct dir
Fixes problem partially fixed in commit
e3196693258c2935023f482592ff16de6f6f56ec.
src/lua-factory/meson.build | 2 +-
src/lua-factory/sources/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/lua-factory/meson.build b/src/lua-factory/meson.build
index 932462b..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(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,
diff --git a/src/lua-factory/sources/meson.build b/src/lua-factory/sources/meson.build
index 6d66d4e..3c09db0 100644
--- a/src/lua-factory/sources/meson.build
+++ b/src/lua-factory/sources/meson.build
@@ -33,7 +33,7 @@ resources = [
foreach s: sources
f = s + '.lua'
install_data(f,
- install_dir: luafactorydir)
+ install_dir: join_paths(datadir, luafactorydir))
endforeach
foreach r: resources
@@ -43,7 +43,7 @@ foreach r: resources
output: output,
input: input,
install: true,
- install_dir: luafactorydir,
+ install_dir: join_paths(datadir, luafactorydir),
command: [glib_compile_resources,
'--sourcedir', meson.current_source_dir(),
'--target', '@OUTPUT@',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]