From 1a4270d12cbcf2b6c95f3c6226a71eaadd065c8f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 10 Feb 2021 11:47:42 +0000 Subject: build: Leave gir_dir_prefix unexpanded This will let us append it to relative paths inside giscanner to get a relocatable path relative to the tools, which seems to have always been the intention. Helps: #323, #455 Signed-off-by: Simon McVittie --- meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index f617f765..1bde17bb 100644 --- a/meson.build +++ b/meson.build @@ -90,14 +90,13 @@ config.set('GI_MICRO_VERSION', gi_versions[2]) config.set_quoted('GIR_SUFFIX', 'gir-1.0') gir_dir_prefix = get_option('gir_dir_prefix') -if gir_dir_prefix == '' - gir_dir_prefix = join_paths(get_option('prefix'), get_option('datadir')) +if gir_dir_prefix == '' or gir_dir_prefix == get_option('datadir') + gir_dir_prefix = get_option('datadir') gir_dir_pc_prefix = '${datadir}' else - gir_dir_prefix = join_paths(get_option('prefix'), gir_dir_prefix) gir_dir_pc_prefix = join_paths('${prefix}', gir_dir_prefix) endif -girdir = join_paths(gir_dir_prefix, 'gir-1.0') +girdir = join_paths(get_option('prefix'), gir_dir_prefix, 'gir-1.0') config.set_quoted('GIR_DIR', girdir) config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) -- cgit v1.2.1