fdo-mirrors/wayland-protocols
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland-protocols.git synced 2025-12-20 15:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pc' into 'main'

Browse source 
build: also set includedir in uninstalled pkg-config file

See merge request wayland/wayland-protocols!469
This commit is contained in:
rewine 2025-12-16 09:40:34 +00:00
commit 30e25854d1
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

@ -166,6 +166,7 @@ pkgconfig_configuration.set('prefix', get_option('prefix'))
pkgconfig_configuration.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) pkgconfig_configuration.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
pkgconfig_configuration.set('datarootdir', '${prefix}/@0@'.format(get_option('datadir'))) pkgconfig_configuration.set('datarootdir', '${prefix}/@0@'.format(get_option('datadir')))
pkgconfig_configuration.set('abs_top_srcdir', wayland_protocols_srcdir) pkgconfig_configuration.set('abs_top_srcdir', wayland_protocols_srcdir)
pkgconfig_configuration.set('abs_top_includedir', join_paths(meson.current_build_dir(), get_option('includedir'), 'wayland-protocols'))
pkgconfig_configuration.set('PACKAGE', 'wayland-protocols') pkgconfig_configuration.set('PACKAGE', 'wayland-protocols')
pkgconfig_configuration.set('WAYLAND_PROTOCOLS_VERSION', wayland_protocols_version) pkgconfig_configuration.set('WAYLAND_PROTOCOLS_VERSION', wayland_protocols_version)

1
wayland-protocols-uninstalled.pc.in
View file

@ -1,3 +1,4 @@
includedir=@abs_top_includedir@
pkgdatadir=@abs_top_srcdir@ pkgdatadir=@abs_top_srcdir@
Name: Wayland Protocols Name: Wayland Protocols