summaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-12-17 16:19:19 +0100
committerIñigo Martínez <inigomartinez@gmail.com>2019-01-21 21:18:06 +0100
commitce13717c433c841f7b3e749ccedcdfc830c4f761 (patch)
tree7979b40dc0d0cf7b90f3f44330ae8ba2a399f242 /monitor
parentb7ca7962e7dcf1508130ffeed515f26036ab2176 (diff)
downloadgvfs-ce13717c433c841f7b3e749ccedcdfc830c4f761.tar.gz
build: Use / instead of join_paths
Since meson 0.49, the `/` character can be used to join paths[0], so all the instances of `join_paths` have been replaced. [0] http://mesonbuild.com/Release-notes-for-0-49-0.html#joining-paths-with-
Diffstat (limited to 'monitor')
-rw-r--r--monitor/meson.build6
-rw-r--r--monitor/proxy/meson.build2
2 files changed, 4 insertions, 4 deletions
diff --git a/monitor/meson.build b/monitor/meson.build
index 15934e7f..05a080e7 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -35,7 +35,7 @@ foreach monitor: monitors
service = dbus_exec + '.service'
configure_file(
- input: join_paths(monitor_name, service + '.in'),
+ input: monitor_name / service + '.in',
output: service,
install: true,
install_dir: systemd_user_unit_dir,
@@ -45,7 +45,7 @@ foreach monitor: monitors
dbus_systemd_service = 'SystemdService=' + service
endif
- monitor_data = files(join_paths(monitor_name, monitor_name + '.monitor'))
+ monitor_data = files(monitor_name / monitor_name + '.monitor')
install_data(
monitor_data,
@@ -54,7 +54,7 @@ foreach monitor: monitors
dbus_service_conf = configuration_data()
dbus_service_conf.set('service', dbus_service)
- dbus_service_conf.set('exec', join_paths(gvfs_libexecdir, dbus_exec))
+ dbus_service_conf.set('exec', gvfs_libexecdir / dbus_exec)
dbus_service_conf.set('systemd_service', dbus_systemd_service)
monitor_service = configure_file(
diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build
index fb285ebd..89119557 100644
--- a/monitor/proxy/meson.build
+++ b/monitor/proxy/meson.build
@@ -27,7 +27,7 @@ cflags = [
'-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir),
]
-symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
+symbol_map = meson.current_source_dir() / 'symbol.map'
ldflags = []
if have_version_script