diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-24 14:13:04 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-24 21:09:09 +0200 |
| commit | 6dd222e753f8313e40d8945d341b79668c8016c3 (patch) | |
| tree | 2d614997fe41e7033abdacbc0240ce1734a188d8 /gmodule | |
| parent | 8fe2e4d364e3edc8f7c2d5e7817593d2063abd52 (diff) | |
| download | glib-6dd222e753f8313e40d8945d341b79668c8016c3.tar.gz | |
meson: Cleanup include-dir paths, use base path without repetitions
Avoid setting the subdir all the times, just use the global definition
plus the specific module subdir
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gmodule/meson.build b/gmodule/meson.build index 0c5d7f89a..7ca10a529 100644 --- a/gmodule/meson.build +++ b/gmodule/meson.build @@ -6,6 +6,8 @@ g_module_have_dlerror = 0 g_module_impl = '' +g_module_includedir = glib_includedir / 'gmodule' + # On Windows force native WIN32 shared lib loader if host_system == 'windows' g_module_impl = 'G_MODULE_IMPL_WIN32' @@ -64,13 +66,13 @@ gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in', gmodule_h = files('gmodule.h') gmodule_c = files('gmodule.c') -install_headers([gmodule_h], subdir : 'glib-2.0') +install_headers([gmodule_h], install_dir : glib_includedir) gvisibility_h = custom_target( output: 'gmodule-visibility.h', command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GMODULE', '@OUTPUT@'], install: true, - install_dir: glib_includedir / 'gmodule', + install_dir: g_module_includedir, install_tag : 'devel', ) |