diff options
| author | Ondrej Holy <oholy@redhat.com> | 2019-01-07 17:44:09 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2019-01-07 17:44:09 +0100 |
| commit | 47203abf0b087be1fbf936d4040291e97fe39e16 (patch) | |
| tree | 92559d613009f763cc67df5a8a019d2bdde963ef /daemon | |
| parent | d1974938a5acaaed2cfee8da6dc254c74c0d4fb6 (diff) | |
| download | gvfs-47203abf0b087be1fbf936d4040291e97fe39e16.tar.gz | |
Revert "build: Do not use prefix on directory variables"
This reverts commit db31059d1b7b11b597b03064329fb1e8899b11f2.
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 9c402d22..e803a743 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_prefix / gvfs_libexecdir / dbus_exec) +dbus_service_conf.set('exec', 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_prefix / gvfs_libexecdir), - '-DMOUNTABLE_DIR="@0@"'.format(gvfs_prefix / gvfs_mounts_dir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), + '-DLIBEXEC_DIR="@0@"'.format(gvfs_libexecdir), + '-DMOUNTABLE_DIR="@0@"'.format(gvfs_mountdir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), ] libgvfsdaemon = shared_library( @@ -604,7 +604,7 @@ foreach mount: mounts output: '@BASENAME@', configuration: service_conf, install: true, - install_dir: gvfs_mounts_dir, + install_dir: gvfs_mountdir, ) endforeach |