diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-11-16 03:15:00 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-11-17 15:55:29 +0000 |
| commit | f08c25ddd93ad3fa691172119a038465cd178420 (patch) | |
| tree | 9d38bf6e48510ee3cd0d352262fe3df90ea2c010 /contrib | |
| parent | af18fd29cf99e32a1a1a0ede4239f2c41a1f3811 (diff) | |
| download | colord-f08c25ddd93ad3fa691172119a038465cd178420.tar.gz | |
build: Refactor directory selection
Previously, the various install paths were obtained using get_option
as needed. This lead to the directories sometimes not prepended with
prefix.
This patch unifies the directory selection inside the top-level meson
file.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/colord-sane/meson.build | 2 | ||||
| -rw-r--r-- | contrib/session-helper/meson.build | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/contrib/colord-sane/meson.build b/contrib/colord-sane/meson.build index 9967302..77c98f1 100644 --- a/contrib/colord-sane/meson.build +++ b/contrib/colord-sane/meson.build @@ -21,5 +21,5 @@ executable( cargs, ], install : true, - install_dir : get_option('libexecdir') + install_dir : libexecdir ) diff --git a/contrib/session-helper/meson.build b/contrib/session-helper/meson.build index ffff770..2ce7b23 100644 --- a/contrib/session-helper/meson.build +++ b/contrib/session-helper/meson.build @@ -1,7 +1,7 @@ cargs = ['-DG_LOG_DOMAIN="Cd"'] install_data('org.freedesktop.ColorHelper.xml', - install_dir : join_paths(get_option('datadir'), 'dbus-1', 'interfaces') + install_dir : join_paths(datadir, 'dbus-1', 'interfaces') ) install_headers( @@ -10,9 +10,7 @@ install_headers( ) con2 = configuration_data() -con2.set('servicedir', - join_paths(get_option('prefix'), - get_option('libexecdir'))) +con2.set('servicedir', libexecdir) # replace @servicedir@ if get_option('enable-systemd') @@ -31,7 +29,7 @@ configure_file( output : 'org.freedesktop.ColorHelper.service', configuration : con2, install: true, - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services') , + install_dir: join_paths(datadir, 'dbus-1', 'services') , ) executable( @@ -59,7 +57,7 @@ executable( cargs, ], install : true, - install_dir : get_option('libexecdir') + install_dir : libexecdir ) install_data('org.freedesktop.ColorHelper.gschema.xml', |