From 7fde89de74f2d25cf2c074d227a7ffd3a732647d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Mon, 17 Dec 2018 23:25:38 +0100 Subject: 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. --- client/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/meson.build b/client/meson.build index 73b8d7e3..8f57d0d3 100644 --- a/client/meson.build +++ b/client/meson.build @@ -39,8 +39,8 @@ 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_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), + '-DGVFS_MODULE_DIR="@0@"'.format(gvfs_prefix / gvfs_pkglibdir / 'modules'), ] symbol_map = meson.current_source_dir() / 'symbol.map' -- cgit v1.2.1