diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-17 23:25:38 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-21 21:18:06 +0100 |
| commit | 7fde89de74f2d25cf2c074d227a7ffd3a732647d (patch) | |
| tree | 563007cbfd392e3bf61a8a7c91f00f59247772bb /daemon | |
| parent | 5d2533279cdc4660fa0a6f85d86c3d90d665e9f6 (diff) | |
| download | gvfs-7fde89de74f2d25cf2c074d227a7ffd3a732647d.tar.gz | |
build: Do not use prefix on directory variables
Although usually directory variables are set by using the `prefix`
directory, this might cause issues due to parameters that need
relative directories.
In order to ease the transition `prefix` directory has been stripped
from directory variables and only has been appended when necessary.
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/daemon/meson.build b/daemon/meson.build index e803a743..9c402d22 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -21,7 +21,7 @@ endif dbus_service_conf = configuration_data() dbus_service_conf.set('service', dbus_service) -dbus_service_conf.set('exec', gvfs_libexecdir / dbus_exec) +dbus_service_conf.set('exec', gvfs_prefix / gvfs_libexecdir / dbus_exec) dbus_service_conf.set('systemd_service', dbus_systemd_service) daemon_service = configure_file( @@ -109,9 +109,9 @@ if enable_keyring endif cflags = [ - '-DLIBEXEC_DIR="@0@"'.format(gvfs_libexecdir), - '-DMOUNTABLE_DIR="@0@"'.format(gvfs_mountdir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DLIBEXEC_DIR="@0@"'.format(gvfs_prefix / gvfs_libexecdir), + '-DMOUNTABLE_DIR="@0@"'.format(gvfs_prefix / gvfs_mounts_dir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] libgvfsdaemon = shared_library( @@ -604,7 +604,7 @@ foreach mount: mounts output: '@BASENAME@', configuration: service_conf, install: true, - install_dir: gvfs_mountdir, + install_dir: gvfs_mounts_dir, ) endforeach |