diff options
| author | Alexander Mikhaylenko <exalm7659@gmail.com> | 2018-07-17 22:17:52 +0000 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2018-07-23 19:57:42 +0000 |
| commit | f88ec4080ffa14384a325dcb9f8d7e2c6c220565 (patch) | |
| tree | d77dedd80da485b50e9f82118267f5d5ea8540eb | |
| parent | 4d2775612899597fe25d28ab385b6b510af6ca13 (diff) | |
| download | grilo-plugins-f88ec4080ffa14384a325dcb9f8d7e2c6c220565.tar.gz | |
meson: Search lua-factory sources to correct dir
Fixes problem partially fixed in commit
e3196693258c2935023f482592ff16de6f6f56ec.
| -rw-r--r-- | src/lua-factory/meson.build | 2 | ||||
| -rw-r--r-- | 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@', |