diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-08-10 11:16:47 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2018-08-11 22:56:33 +0200 |
| commit | 14d49e69dc320e9a2953b9753441fab5a058c60f (patch) | |
| tree | a02402e6cc4331127d20aa92e40dc7afcd43d005 | |
| parent | 09e7dae79490cd1a7bff7a740c2380095492156f (diff) | |
| download | dconf-14d49e69dc320e9a2953b9753441fab5a058c60f.tar.gz | |
build: Use vapi dir from pkg-config file
The `vapigen` pkg-config file provides a variable with the location
of the vapi files.
This variable is checked to set the installation directory of the
vapi file provided by dconf.
| -rw-r--r-- | client/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/client/meson.build b/client/meson.build index 88492fb..a526c11 100644 --- a/client/meson.build +++ b/client/meson.build @@ -62,5 +62,5 @@ vapi_data = libdconf_vapi + files(meson.project_name() + '.deps') install_data( vapi_data, - install_dir: join_paths(dconf_datadir, 'vala', 'vapi') + install_dir: vapi_dir ) diff --git a/meson.build b/meson.build index 6cdef07..0d3b2f9 100644 --- a/meson.build +++ b/meson.build @@ -44,6 +44,7 @@ glib_dep = dependency('glib-2.0', version: '>= 2.44.0') gio_module_dir = gio_dep.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]) +vapi_dir = dependency('vapigen').get_pkgconfig_variable('vapidir', define_variable: ['datadir', dconf_datadir]) enable_bash_completion = get_option('bash_completion') if enable_bash_completion |