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 --- client/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'client') diff --git a/client/meson.build b/client/meson.build index 74ad446e..fd69f94e 100644 --- a/client/meson.build +++ b/client/meson.build @@ -74,11 +74,10 @@ endif # FUSE daemon if enable_fuse - # FIXME: reusing USE_LIBSYSTEMD_LOGIN as systemd has no universal header or pkg-config file - if enable_libsystemd_login + if install_tmp_files_dir install_data( 'gvfsd-fuse-tmpfiles.conf', - install_dir: join_paths(gvfs_libdir, 'tmpfiles.d') + install_dir: tmp_files_dir ) endif -- cgit v1.2.1