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

This reverts commit 22e9f7721b891b17cd726f1bf92b15a35be34d22.

11 files changed, 40 insertions, 50 deletions

diff --git a/client/meson.build b/client/meson.build
index 73b8d7e3..72e80c10 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -60,7 +60,7 @@ libgvfsdbus = shared_module(
   link_depends: symbol_map,
   install: true,
   install_rpath: gvfs_rpath,
-  install_dir: gio_giomoduledir,
+  install_dir: gio_module_dir,
 )
 
 if enable_devel_utils
@@ -77,10 +77,10 @@ endif
 
 # FUSE daemon
 if enable_fuse
-  if install_systemd_tmpfilesdir
+  if install_tmp_files_dir
     install_data(
       'gvfsd-fuse-tmpfiles.conf',
-      install_dir: systemd_tmpfilesdir,
+      install_dir: tmp_files_dir,
     )
   endif
 
diff --git a/daemon/meson.build b/daemon/meson.build
index 70b0346c..4f3155ef 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -5,14 +5,14 @@ dbus_service = gvfs_namespace + '.Daemon'
 dbus_exec = 'gvfsd'
 dbus_systemd_service = ''
 
-if install_systemd_systemduserunitdir
+if install_systemd_user_unit_dir
   service = 'gvfs-daemon.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_systemduserunitdir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf,
   )
 
@@ -28,7 +28,7 @@ daemon_service = configure_file(
   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,
 )
 
@@ -42,7 +42,7 @@ gnome.mkenums(
   vtail: '  </@type@>',
   ftail: '</schemalist>',
   install_header: true,
-  install_dir: gio_schemasdir,
+  install_dir: gvfs_schema_dir,
 )
 
 sources = files(
@@ -630,7 +630,7 @@ endif
 
 install_data(
   schema_data,
-  install_dir: gio_schemasdir,
+  install_dir: gvfs_schema_dir,
 )
 
 install_data(
diff --git a/meson.build b/meson.build
index 19e91c3a..c6ee6fe3 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,7 @@ gvfs_rpath = gvfs_pkglibdir
 gvfs_remote_volume_monitors_dir = gvfs_pkgdatadir / 'remote-volume-monitors'
 
 gvfs_mountdir = gvfs_pkgdatadir / 'mounts'
+gvfs_schema_dir = gvfs_datadir / 'glib-2.0/schemas'
 
 gvfs_namespace = 'org.gtk.vfs'
 
@@ -238,44 +239,33 @@ endif
 config_h.set('HAVE_GCRYPT', enable_gcrypt)
 
 # *** Check for dbus service dir ***
-dbus_session_bus_services_dir = dependency('dbus-1').get_pkgconfig_variable(
-  'session_bus_services_dir',
-  define_variable: ['datadir', gvfs_datadir],
-)
+dbus_dep = dependency('dbus-1')
+dbus_service_dir = dbus_dep.get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', gvfs_datadir])
 
 dbus_service_in = files('dbus.service.in')
 
-# *** Check for giomoduledir and schemasdir ***
-gio_giomoduledir = gio_dep.get_pkgconfig_variable(
-  'giomoduledir',
-  define_variable: ['libdir', gvfs_libdir],
-)
-
-gio_schemasdir = gio_dep.get_pkgconfig_variable(
-  'schemasdir',
-  define_variable: ['datadir', gvfs_datadir],
-  default: gvfs_datadir / 'glib-2.0/schemas',
-)
+# *** Check for gio module dir ***
+gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', gvfs_libdir])
 
 # *** Check for systemd options ***
-systemd_systemduserunitdir = get_option('systemduserunitdir')
-install_systemd_systemduserunitdir = (systemd_systemduserunitdir != 'no')
+systemd_user_unit_dir = get_option('systemduserunitdir')
+install_systemd_user_unit_dir = (systemd_user_unit_dir != 'no')
 
-systemd_tmpfilesdir = get_option('tmpfilesdir')
-install_systemd_tmpfilesdir = (systemd_tmpfilesdir != 'no')
+tmp_files_dir = get_option('tmpfilesdir')
+install_tmp_files_dir = (tmp_files_dir != 'no')
 
-if install_systemd_systemduserunitdir or install_systemd_tmpfilesdir
-  if systemd_systemduserunitdir == '' or systemd_tmpfilesdir == ''
+if install_systemd_user_unit_dir or install_tmp_files_dir
+  if systemd_user_unit_dir == '' or tmp_files_dir == ''
     systemd_dep = dependency('systemd', version: '>= 206', required: false)
 
-    if install_systemd_systemduserunitdir and systemd_systemduserunitdir == ''
+    if install_systemd_user_unit_dir and systemd_user_unit_dir == ''
       assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-      systemd_systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
+      systemd_user_unit_dir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
     endif
 
-    if install_systemd_tmpfilesdir and systemd_tmpfilesdir == ''
+    if install_tmp_files_dir and tmp_files_dir == ''
       assert(systemd_dep.found(), 'systemd not found, if you use opentmpfiles please provide a valid systemd user unit dir or disable it')
-      systemd_tmpfilesdir = systemd_dep.get_pkgconfig_variable('tmpfilesdir')
+      tmp_files_dir = systemd_dep.get_pkgconfig_variable('tmpfilesdir')
     endif
   endif
 endif
@@ -491,14 +481,14 @@ configure_file(
 
 meson.add_install_script(
   'meson_post_install.py',
-  gio_schemasdir,
-  gio_giomoduledir,
+  gvfs_schema_dir,
+  gio_module_dir,
 )
 
 output = gvfs_name + ' ' + gvfs_version + ' configuration summary:\n'
 output += '\n'
-output += '  systemduserunitdir: ' + systemd_systemduserunitdir + '\n'
-output += '  tmpfilesdir: ' + systemd_tmpfilesdir + '\n'
+output += '  systemduserunitdir: ' + systemd_user_unit_dir + '\n'
+output += '  tmpfilesdir: ' + tmp_files_dir + '\n'
 output += '\n'
 output += '  admin: ' + enable_admin.to_string() + '\n'
 output += '  afc: ' + enable_afc.to_string() + '\n'
diff --git a/metadata/meson.build b/metadata/meson.build
index 081213dd..929d32fa 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -2,14 +2,14 @@ dbus_service = gvfs_namespace + '.Metadata'
 dbus_exec = 'gvfsd-metadata'
 dbus_systemd_service = ''
 
-if install_systemd_systemduserunitdir
+if install_systemd_user_unit_dir
   service = 'gvfs-metadata.service'
 
   configure_file(
     input: service + '.in',
     output: service,
     install: true,
-    install_dir: systemd_systemduserunitdir,
+    install_dir: systemd_user_unit_dir,
     configuration: service_conf,
   )
 
@@ -25,7 +25,7 @@ metadata_service = configure_file(
   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/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',
 ]