diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-17 16:19:19 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-21 21:18:06 +0100 |
| commit | ce13717c433c841f7b3e749ccedcdfc830c4f761 (patch) | |
| tree | 7979b40dc0d0cf7b90f3f44330ae8ba2a399f242 /client | |
| parent | b7ca7962e7dcf1508130ffeed515f26036ab2176 (diff) | |
| download | gvfs-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 'client')
| -rw-r--r-- | client/meson.build | 6 |
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 |