fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2025-12-20 04:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pkg-config' into 'master'

Browse source 
meson: enable override of arch-independent pkg-config

See merge request xorg/proto/xorgproto!48
This commit is contained in:
Rudi Heitbaum 2025-11-09 22:55:23 +11:00
commit 4aa961a138
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -59,12 +59,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
@ -102,7 +104,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

2
meson_options.txt
View file

@ -1 +1,3 @@
option('legacy', type: 'boolean', value: false)
option('pkgconfigdatadir', type : 'string', value : '',
description : 'directory for arch-independent pkg-config files')