From b37c72a95a4226778795b4498db87413f6184fdd Mon Sep 17 00:00:00 2001 From: Wonki Kim Date: Thu, 21 Feb 2019 09:50:18 +0000 Subject: [PATCH] meson: modify install pathes for modules of ecore_buffer there are differences between meson and autotools. autotools installs them under ${libdir}/ecore_buffer/modules/module/version/ as module.so Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D7837 --- src/modules/ecore_buffer/shm/meson.build | 8 +++++--- src/modules/ecore_buffer/x11_dri2/meson.build | 8 +++++--- src/modules/ecore_buffer/x11_dri3/meson.build | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/modules/ecore_buffer/shm/meson.build b/src/modules/ecore_buffer/shm/meson.build index 30da825227..baf9a0fc5a 100644 --- a/src/modules/ecore_buffer/shm/meson.build +++ b/src/modules/ecore_buffer/shm/meson.build @@ -1,5 +1,7 @@ -ecore_buffer_shm_mod = shared_module('ecore_buffer_shm_mod', +ecore_buffer_shm_mod = shared_module('module', 'ecore_buffer_shm.c', + name_prefix: '', dependencies: [ecore, ecore_buffer], - install: true -) \ No newline at end of file + install: true, + install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'shm', version_name) +) diff --git a/src/modules/ecore_buffer/x11_dri2/meson.build b/src/modules/ecore_buffer/x11_dri2/meson.build index 37ed534bd3..b63823b3bc 100644 --- a/src/modules/ecore_buffer/x11_dri2/meson.build +++ b/src/modules/ecore_buffer/x11_dri2/meson.build @@ -1,5 +1,7 @@ -ecore_buffer_x11_dri2_mod = shared_module('ecore_buffer_x11_dri2_mod', +ecore_buffer_x11_dri2_mod = shared_module('module', 'ecore_buffer_x11_dri2.c', + name_prefix: '', dependencies: [ecore, ecore_buffer, ecore_x], - install: true -) \ No newline at end of file + install: true, + install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri2', version_name) +) diff --git a/src/modules/ecore_buffer/x11_dri3/meson.build b/src/modules/ecore_buffer/x11_dri3/meson.build index 5126fff6ca..e3a7dd18e4 100644 --- a/src/modules/ecore_buffer/x11_dri3/meson.build +++ b/src/modules/ecore_buffer/x11_dri3/meson.build @@ -1,7 +1,9 @@ if dependency('libtbm', required: false).found() == true and dependency('libdrm', required: false).found() - ecore_buffer_x11_dri3_mod = shared_module('ecore_buffer_x11_dri3_mod', + ecore_buffer_x11_dri3_mod = shared_module('module', 'ecore_buffer_x11_dri3.c', + name_prefix: '', dependencies: [ecore, ecore_buffer, ecore_x], - install: true + install: true, + install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri3', version_name) ) -endif \ No newline at end of file +endif