diff options
| author | Ondrej Holy <oholy@redhat.com> | 2019-01-07 17:44:10 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2019-01-07 17:44:10 +0100 |
| commit | f1678f8822c53cbd51c65efe6d38fd4e177a586d (patch) | |
| tree | fe27d15a5c6d0a43a6f6f612b0319fa23b276962 /client | |
| parent | ab6723ff454675abe7fad31945b2aebeac5b1e6a (diff) | |
| download | gvfs-f1678f8822c53cbd51c65efe6d38fd4e177a586d.tar.gz | |
Revert "build: Use / instead of join_paths"
This reverts commit 9523d8e09e0088c8cd58ace494d47cc3083151fc.
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 72e80c10..b2d13597 100644 --- a/client/meson.build +++ b/client/meson.build @@ -5,7 +5,7 @@ headers = files( install_headers( headers, - subdir: 'gvfs-client/gvfs', + subdir: join_paths('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(gvfs_pkglibdir / 'modules'), + '-DGVFS_MODULE_DIR="@0@"'.format(join_paths(gvfs_libdir, 'gvfs', 'modules')), ] -symbol_map = meson.current_source_dir() / 'symbol.map' +symbol_map = join_paths(meson.current_source_dir(), 'symbol.map') ldflags = [] if have_version_script |