diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-04-09 20:44:50 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2018-08-11 22:55:53 +0200 |
| commit | 9f0651c795ad0f6cfa19e78baa661f940c94b6d2 (patch) | |
| tree | 4aac77f2018747eb423ecd211c2aacc4cac04e9d /meson.build | |
| parent | 082a10cbadd6d7951d12c9b92aa5e1e7278f0068 (diff) | |
| download | dconf-9f0651c795ad0f6cfa19e78baa661f940c94b6d2.tar.gz | |
build: Retrieve D-Bus and gio paths from pkg-config files
D-Bus' session bus services' paths and gio's module's paths are
hardcoded. However, these directories can be retrieved by checking
this information from their pkgconfig files.
This patch retrieves the paths for their correspondant pkgconfig
files and uses those paths as installation directories.
The options to set different directories for these options are not
necessary anymore, so they have been removed.
Finally, the post install script does not depend anymore on the
existence of `gio-querymodules` and is always executed.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 9ed24ba..b1bbaa4 100644 --- a/meson.build +++ b/meson.build @@ -68,15 +68,8 @@ gio_unix_req_version = '>= 2.25.7' glib_dep = dependency('glib-2.0', version: '>= 2.44.0') gio_unix_dep = dependency('gio-unix-2.0', version: gio_unix_req_version) -gio_querymodules = find_program('gio-querymodules', required: false) -if gio_querymodules.found() - gio_modules_dir = get_option('gio_modules_dir') - if gio_modules_dir == '' - gio_modules_dir = join_paths(dconf_libdir, 'gio', 'modules') - endif - - meson.add_install_script('meson_post_install.py', gio_querymodules.path(), gio_modules_dir) -endif +gio_module_dir = dependency('gio-2.0').get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir]) +dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir]) configure_file( output: 'config.h', @@ -105,3 +98,5 @@ subdir('client') subdir('bin') subdir('docs') subdir('tests') + +meson.add_install_script('meson_post_install.py', gio_module_dir) |