summaryrefslogtreecommitdiff
path: root/client
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-04 16:33:53 +0100
commit9523d8e09e0088c8cd58ace494d47cc3083151fc (patch)
tree489b34243b97c821fc4541dcbf60b6b460c45219 /client
parent5bc63310a721946199c68160b5134971d5fe0fc6 (diff)
downloadgvfs-9523d8e09e0088c8cd58ace494d47cc3083151fc.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 'client')
-rw-r--r--client/meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/client/meson.build b/client/meson.build
index b2d13597..72e80c10 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -5,7 +5,7 @@ headers = files(
install_headers(
headers,
- subdir: join_paths('gvfs-client', 'gvfs'),
+ subdir: 'gvfs-client/gvfs',
)
# Dynamic client lib
@@ -40,10 +40,10 @@ deps = [
cflags = [
'-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()),
'-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
- '-DGVFS_MODULE_DIR="@0@"'.format(join_paths(gvfs_libdir, 'gvfs', 'modules')),
+ '-DGVFS_MODULE_DIR="@0@"'.format(gvfs_pkglibdir / 'modules'),
]
-symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
+symbol_map = meson.current_source_dir() / 'symbol.map'
ldflags = []
if have_version_script