From 1d3e2a5ad1cb1f5c4526b3155daa6f3e386bd970 Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Wed, 24 Apr 2019 02:31:46 +0000 Subject: [PATCH] meson: Fix evas engine install directory. Evas module loading code assumes engines are installed in evas/modules/engines. As part of the fixes building evas with meson, the engines are under a subproject named evas/engines, causing the modules to be installed in libdir/evas/engines/modules by default. This commit adds a override of the directory the engine modules are installed to use the correct location. Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D8693 --- src/modules/evas/engines/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build index 1891af0..bf1b95e 100644 --- a/src/modules/evas/engines/meson.build +++ b/src/modules/evas/engines/meson.build @@ -50,7 +50,10 @@ foreach engine_conf : engines set_variable(var_name, engine_dep) mod_full_name = engine - mod_install_dir = join_paths(dir_package_modules, 'engines', engine, version_name) + # root meson.build declares the root evas engines project as `evas/engines`, + # but modules must be installed in evas/modules + evas_package_modules = join_paths(dir_lib, 'evas', 'modules') + mod_install_dir = join_paths(evas_package_modules, 'engines', engine, version_name) subdir(engine) -- 2.7.4