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

6 files changed, 18 insertions, 18 deletions

diff --git a/monitor/afc/meson.build b/monitor/afc/meson.build
index 776341f0..830f8ccd 100644
--- a/monitor/afc/meson.build
+++ b/monitor/afc/meson.build
@@ -11,18 +11,18 @@ afc_service = configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: gvfs_dbus_service_dir,
+  install_dir: dbus_service_dir,
   configuration: service_conf
 )
 
-if have_systemd_user_unit
+if install_systemd_user_unit_dir
   service = 'gvfs-afc-volume-monitor.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_user_dir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
 endif
diff --git a/monitor/gdu/meson.build b/monitor/gdu/meson.build
index 653faebc..ba865631 100644
--- a/monitor/gdu/meson.build
+++ b/monitor/gdu/meson.build
@@ -11,18 +11,18 @@ gdu_service = configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: gvfs_dbus_service_dir,
+  install_dir: dbus_service_dir,
   configuration: service_conf
 )
 
-if have_systemd_user_unit
+if install_systemd_user_unit_dir
   service = 'gvfs-gdu-volume-monitor.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_user_dir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
 endif
diff --git a/monitor/goa/meson.build b/monitor/goa/meson.build
index 111d8d45..b45007ce 100644
--- a/monitor/goa/meson.build
+++ b/monitor/goa/meson.build
@@ -9,18 +9,18 @@ configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: gvfs_dbus_service_dir,
+  install_dir: dbus_service_dir,
   configuration: service_conf
 )
 
-if have_systemd_user_unit
+if install_systemd_user_unit_dir
   service = 'gvfs-goa-volume-monitor.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_user_dir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
 endif
diff --git a/monitor/gphoto2/meson.build b/monitor/gphoto2/meson.build
index 2cb3128d..7400071b 100644
--- a/monitor/gphoto2/meson.build
+++ b/monitor/gphoto2/meson.build
@@ -11,18 +11,18 @@ gphoto2_service = configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: gvfs_dbus_service_dir,
+  install_dir: dbus_service_dir,
   configuration: service_conf
 )
 
-if have_systemd_user_unit
+if install_systemd_user_unit_dir
   service = 'gvfs-gphoto2-volume-monitor.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_user_dir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
 endif
diff --git a/monitor/mtp/meson.build b/monitor/mtp/meson.build
index 21eb427d..a3468765 100644
--- a/monitor/mtp/meson.build
+++ b/monitor/mtp/meson.build
@@ -9,18 +9,18 @@ configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: gvfs_dbus_service_dir,
+  install_dir: dbus_service_dir,
   configuration: service_conf
 )
 
-if have_systemd_user_unit
+if install_systemd_user_unit_dir
   service = 'gvfs-mtp-volume-monitor.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_user_dir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
 endif
diff --git a/monitor/udisks2/meson.build b/monitor/udisks2/meson.build
index 44e49232..995b3008 100644
--- a/monitor/udisks2/meson.build
+++ b/monitor/udisks2/meson.build
@@ -11,18 +11,18 @@ udisks2_service = configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: gvfs_dbus_service_dir,
+  install_dir: dbus_service_dir,
   configuration: service_conf
 )
 
-if have_systemd_user_unit
+if install_systemd_user_unit_dir
   service = 'gvfs-udisks2-volume-monitor.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_user_dir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
 endif