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-04 16:33:53 +0100 |
| commit | db31059d1b7b11b597b03064329fb1e8899b11f2 (patch) | |
| tree | a6c940107753ad623c3b9bc08b864bd89194d7ce /metadata | |
| parent | 32bde011b2522d302d72506884866bd809ef5bda (diff) | |
| download | gvfs-db31059d1b7b11b597b03064329fb1e8899b11f2.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 'metadata')
| -rw-r--r-- | metadata/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/metadata/meson.build b/metadata/meson.build index e51f1564..f847e484 100644 --- a/metadata/meson.build +++ b/metadata/meson.build @@ -18,7 +18,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) metadata_service = configure_file( @@ -51,7 +51,7 @@ deps = [ cflags = [ '-DDBUS_API_SUBJECT_TO_CHANGE', '-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] libmetadata = static_library( |