diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-10-19 17:01:45 +0200 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-10-21 00:22:40 +0200 |
| commit | c5b5636ff91c9e9913d56acee88b9703ba6fe47f (patch) | |
| tree | e5cefdfb624723baf3f481fd8549f779402651af | |
| parent | cc6cd9d569df4ed2c0dad39dcee0cadea6416e59 (diff) | |
| download | geoclue-c5b5636ff91c9e9913d56acee88b9703ba6fe47f.tar.gz | |
build: Make dbus_interface_dir absolute
Removes the need for a separate abs_dbus_interface_dir.
| -rw-r--r-- | src/meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/meson.build b/src/meson.build index 9343447..d33dcf4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,5 @@ -dbus_interface_dir = join_paths(get_option('datadir'), 'dbus-1', 'interfaces') -abs_dbus_interface_dir = join_paths(get_option('prefix'), dbus_interface_dir) +dbus_interface_dir = join_paths(get_option('prefix'), get_option('datadir'), + 'dbus-1', 'interfaces') subdir('agent') @@ -129,8 +129,8 @@ executable('geoclue', install: true, install_dir: install_dir) -dbus_interface = join_paths(abs_dbus_interface_dir, 'org.freedesktop.GeoClue2.xml') -agent_dbus_interface = join_paths(abs_dbus_interface_dir, 'org.freedesktop.GeoClue2.Agent.xml') +dbus_interface = join_paths(dbus_interface_dir, 'org.freedesktop.GeoClue2.xml') +agent_dbus_interface = join_paths(dbus_interface_dir, 'org.freedesktop.GeoClue2.Agent.xml') pkgconf = import('pkgconfig') pkgconf.generate(version: gclue_version, name: 'Geoclue', |