From 250afc2e1d614cd7ab852ba4278194468ced09e1 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 10 Oct 2018 13:24:09 +0200 Subject: build: Make girdir in .pc files relative to ${datadir} by default This was the de facto behavior, and is already relied upon. If gir-dir-prefix is specified, the gir dir will rely on the more generic ${prefix} location. Also, avoid expanding the path unless necessary in the autotools build. https://gitlab.gnome.org/GNOME/gobject-introspection/issues/236 --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 78585a90..4022e319 100644 --- a/meson.build +++ b/meson.build @@ -20,9 +20,13 @@ config = configuration_data() config.set_quoted('GIR_SUFFIX', 'gir-1.0') gir_dir_prefix = get_option('gir-dir-prefix') if gir_dir_prefix == '' - gir_dir_prefix = get_option('datadir') + gir_dir_prefix = join_paths(get_option('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(get_option('prefix'), gir_dir_prefix, 'gir-1.0') +girdir = join_paths(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'))) @@ -98,7 +102,7 @@ pkgconfig_conf.set('libdir', join_paths('${prefix}', get_option('libdir'))) pkgconfig_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir'))) pkgconfig_conf.set('datadir', '${datarootdir}') pkgconfig_conf.set('includedir', join_paths('${prefix}', get_option('includedir'))) -pkgconfig_conf.set('GIR_DIR', join_paths('${prefix}', gir_dir_prefix, 'gir-1.0')) +pkgconfig_conf.set('GIR_PC_DIR', join_paths(gir_dir_pc_prefix, 'gir-1.0')) if host_system == 'windows' or host_system == 'cygwin' pkgconfig_conf.set('EXEEXT', '.exe') else -- cgit v1.2.1