summaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-12-17 21:08:43 +0100
committerIñigo Martínez <inigomartinez@gmail.com>2019-01-21 21:18:06 +0100
commitbced2bd5c383935c1487e0d72800c6439e5859c8 (patch)
tree663e79305c7bdbf0ef8895d6afb4a19266b0ea3d /monitor
parentce13717c433c841f7b3e749ccedcdfc830c4f761 (diff)
downloadgvfs-bced2bd5c383935c1487e0d72800c6439e5859c8.tar.gz
build: Fix the use of pkg-config file variables
The names of the variables in meson corresponding to the variables obtained from the pkg-config files has been fixed by using a pattern. The pattern uses the dependency name as the prefix and the obtained variable as the suffix.
Diffstat (limited to 'monitor')
-rw-r--r--monitor/afc/meson.build2
-rw-r--r--monitor/goa/meson.build2
-rw-r--r--monitor/gphoto2/meson.build2
-rw-r--r--monitor/meson.build6
-rw-r--r--monitor/mtp/meson.build2
-rw-r--r--monitor/proxy/meson.build4
-rw-r--r--monitor/udisks2/meson.build2
7 files changed, 10 insertions, 10 deletions
diff --git a/monitor/afc/meson.build b/monitor/afc/meson.build
index ff1177ca..27b1c166 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_module_dir),
+ '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
'-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
]
diff --git a/monitor/goa/meson.build b/monitor/goa/meson.build
index e9f13bdf..5a66b240 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_module_dir),
+ '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
'-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
]
diff --git a/monitor/gphoto2/meson.build b/monitor/gphoto2/meson.build
index 76a0768e..99ef8ceb 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_module_dir),
+ '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
'-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
]
diff --git a/monitor/meson.build b/monitor/meson.build
index 05a080e7..e32817ad 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_user_unit_dir
+ if install_systemd_systemduserunitdir
service = dbus_exec + '.service'
configure_file(
input: monitor_name / service + '.in',
output: service,
install: true,
- install_dir: systemd_user_unit_dir,
+ install_dir: systemd_systemduserunitdir,
configuration: service_conf,
)
@@ -61,7 +61,7 @@ foreach monitor: monitors
input: dbus_service_in,
output: dbus_service + '.service',
install: true,
- install_dir: dbus_service_dir,
+ install_dir: dbus_session_bus_services_dir,
configuration: dbus_service_conf,
)
diff --git a/monitor/mtp/meson.build b/monitor/mtp/meson.build
index 0b107871..c76f8aaa 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_module_dir),
+ '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
'-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
]
diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build
index 89119557..2d616812 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_module_dir),
+ '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
'-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_module_dir,
+ install_dir: gio_giomoduledir,
)
sources = files('gvfsproxyvolumemonitordaemon.c')
diff --git a/monitor/udisks2/meson.build b/monitor/udisks2/meson.build
index 19cd852a..f163d888 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_module_dir),
+ '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir),
'-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
'-DUDISKS_API_IS_SUBJECT_TO_CHANGE',
]