diff options
| author | Simon McVittie <smcv@debian.org> | 2021-02-10 11:47:42 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2023-03-14 12:37:48 +0000 |
| commit | 1a4270d12cbcf2b6c95f3c6226a71eaadd065c8f (patch) | |
| tree | 2a2f60942978b58ec202459a62f252a7fe366461 | |
| parent | 484a26d9ccba361b3135162c677cd4e3aaed739d (diff) | |
| download | gobject-introspection-1a4270d12cbcf2b6c95f3c6226a71eaadd065c8f.tar.gz | |
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 <smcv@debian.org>
| -rw-r--r-- | meson.build | 7 |
1 files 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'))) |