From c5f7524f62eda3aa65da0d58add83c1409b77a6f Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 6 Feb 2022 07:56:38 +0000 Subject: [PATCH] meson: enable override of arch-independent pkg-config Add meson_option pkgconfigdatadir to set the directory for arch-independent pkg-config files. Signed-off-by: Rudi Heitbaum --- meson.build | 6 ++++-- meson_options.txt | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 7e02ac5..1da153f 100644 --- a/meson.build +++ b/meson.build @@ -57,12 +57,14 @@ pc_data = configuration_data() pc_data.set('prefix', get_option('prefix')) # meson does not allow installing the includedir outside of the prefix pc_data.set('includedir', '${prefix}/' + get_option('includedir')) +# Dirs of external packages +pkgconfigdatadir = get_option('pkgconfigdatadir') != '' ? get_option('pkgconfigdatadir') : get_option('datadir') / 'pkgconfig' foreach pc : pcs configure_file( input : pc + '.pc.in', output : pc + '.pc', - install_dir : get_option('datadir') + '/pkgconfig', + install_dir : pkgconfigdatadir, configuration : pc_data, ) endforeach @@ -100,7 +102,7 @@ if get_option('legacy') == true configure_file( input : pc + '.pc.in', output : pc + '.pc', - install_dir : get_option('datadir') + '/pkgconfig', + install_dir : pkgconfigdatadir, configuration : pc_data, ) endforeach diff --git a/meson_options.txt b/meson_options.txt index 757cd72..4c80f32 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1 +1,3 @@ option('legacy', type: 'boolean', value: false) +option('pkgconfigdatadir', type : 'string', value : '', + description : 'directory for arch-independent pkg-config files')