Revert "build: Fix the use of pkg-config file variables"

This reverts commit 22e9f7721b891b17cd726f1bf92b15a35be34d22.

7 files changed, 10 insertions, 10 deletions

diff --git a/monitor/afc/meson.build b/monitor/afc/meson.build
index 27b1c166..ff1177ca 100644
--- a/monitor/afc/meson.build
+++ b/monitor/afc/meson.build
@@ -14,7 +14,7 @@ deps = [
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-AFC"',
-  '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
+  '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
diff --git a/monitor/goa/meson.build b/monitor/goa/meson.build
index 5a66b240..e9f13bdf 100644
--- a/monitor/goa/meson.build
+++ b/monitor/goa/meson.build
@@ -13,7 +13,7 @@ deps = [
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-GOA"',
-  '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
+  '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
diff --git a/monitor/gphoto2/meson.build b/monitor/gphoto2/meson.build
index 99ef8ceb..76a0768e 100644
--- a/monitor/gphoto2/meson.build
+++ b/monitor/gphoto2/meson.build
@@ -14,7 +14,7 @@ deps = [
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-GPhoto2"',
-  '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
+  '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
diff --git a/monitor/meson.build b/monitor/meson.build
index e32817ad..05a080e7 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -31,14 +31,14 @@ foreach monitor: monitors
   dbus_exec = 'gvfs-@0@-volume-monitor'.format(monitor_name)
   dbus_systemd_service = ''
 
-  if install_systemd_systemduserunitdir
+  if install_systemd_user_unit_dir
     service = dbus_exec + '.service'
 
     configure_file(
       input: monitor_name / service + '.in',
       output: service,
       install: true,
-      install_dir: systemd_systemduserunitdir,
+      install_dir: systemd_user_unit_dir,
       configuration: service_conf,
     )
 
@@ -61,7 +61,7 @@ foreach monitor: monitors
     input: dbus_service_in,
     output: dbus_service + '.service',
     install: true,
-    install_dir: dbus_session_bus_services_dir,
+    install_dir: dbus_service_dir,
     configuration: dbus_service_conf,
   )
 
diff --git a/monitor/mtp/meson.build b/monitor/mtp/meson.build
index c76f8aaa..0b107871 100644
--- a/monitor/mtp/meson.build
+++ b/monitor/mtp/meson.build
@@ -13,7 +13,7 @@ deps = [
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-MTP"',
-  '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
+  '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
 ]
 
diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build
index 2d616812..89119557 100644
--- a/monitor/proxy/meson.build
+++ b/monitor/proxy/meson.build
@@ -22,7 +22,7 @@ deps = [
 
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitor"',
-  '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
+  '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
   '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir),
 ]
@@ -44,7 +44,7 @@ libgioremote_volume_monitor = shared_module(
   link_depends: symbol_map,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gio_giomoduledir,
+  install_dir: gio_module_dir,
 )
 
 sources = files('gvfsproxyvolumemonitordaemon.c')
diff --git a/monitor/udisks2/meson.build b/monitor/udisks2/meson.build
index f163d888..19cd852a 100644
--- a/monitor/udisks2/meson.build
+++ b/monitor/udisks2/meson.build
@@ -28,7 +28,7 @@ endif
 cflags = [
   '-DG_LOG_DOMAIN="GVFS-UDisks2"',
   '-DG_DISABLE_DEPRECATED',
-  '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
+  '-DGIO_MODULE_DIR="@0@"'.format(gio_module_dir),
   '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
   '-DUDISKS_API_IS_SUBJECT_TO_CHANGE',
 ]