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:59 +0200 |
| commit | 7f1b4031463a9dff47dbc705ba1f2f5cdd3a26d2 (patch) | |
| tree | 8fd927106965811e083c9f2c2d584295b7df05a0 /data | |
| parent | c5b5636ff91c9e9913d56acee88b9703ba6fe47f (diff) | |
build: Gather common path variables in root meson.build
This eliminates a lot of get_option and some join_paths.
Diffstat (limited to 'data')
| -rw-r--r-- | data/meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/meson.build b/data/meson.build index f76df0a..f826864 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,17 +7,17 @@ if get_option('enable-backend') conf.set('demo_agent', '') endif - conf_dir = join_paths(get_option('sysconfdir'), 'geoclue') + conf_dir = join_paths(sysconfdir, 'geoclue') configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, install_dir: conf_dir) conf = configuration_data() - conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) + conf.set('libexecdir', libexecdir) conf.set('dbus_srv_user', get_option('dbus-srv-user')) - service_dir = join_paths(get_option('datadir'), 'dbus-1', 'system-services') + service_dir = join_paths(datadir, 'dbus-1', 'system-services') configure_file(output: 'org.freedesktop.GeoClue2.service', input: 'org.freedesktop.GeoClue2.service.in', configuration: conf, @@ -26,7 +26,7 @@ if get_option('enable-backend') # DBus Service policy file dbus_service_dir = get_option('dbus-sys-dir') if dbus_service_dir == '' - dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d') + dbus_service_dir = join_paths(sysconfdir, 'dbus-1', 'system.d') endif configure_file(output: 'org.freedesktop.GeoClue2.conf', input: 'org.freedesktop.GeoClue2.conf.in', |