From 5e2dff62c1ec332f3f8d7c0c1438835dc66a56b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Tue, 31 Oct 2017 12:35:34 +0100 Subject: build: Improve installation on system paths Instead of being hardcoded, D-Bus, systemd and GIO modules paths can be checked by using the information in their correspondant pkg-config files. This patch uses the information on pkg-config files by default, and also allows the user to provide this information to avoid overwriting system files. https://bugzilla.gnome.org/show_bug.cgi?id=786149 --- meson_options.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 540535a4..38b62dfb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ -option('with-dbus-service-dir', type: 'string', value: '', description: 'choose directory for dbus service files [default=PREFIX/share/dbus-1/services]') -option('with-systemduserunitdir', type: 'string', value: '', description: 'choose directory for systemd user units, or \'no\' to disable [default=PREFIX/lib/systemd/user]') +option('with-dbus-service-dir', type: 'string', value: '', description: 'custom directory for dbus service files') +option('with-gio-module-dir', type: 'string', value: '', description: 'custom directory for gio modules') +option('with-systemduserunitdir', type: 'string', value: '', description: 'custom directory for systemd user units, or \'no\' to disable') +option('with-tmpfilesdir', type: 'string', value: '', description: 'custom directory for tmpfiles.d config files, or \'no\' to disable') option('enable-admin', type: 'boolean', value: true, description: 'build with admin backend') option('enable-afc', type: 'boolean', value: true, description: 'build with afc backend and volume monitor') -- cgit v1.2.1