Merge branch 'wip/jtojnar/join-paths' into 'master'

build: clean up .pc generation

See merge request GNOME/gtk!1793
This commit is contained in:
Matthias Clasen 2020-04-29 11:34:07 +00:00
commit 3209d0f937

View File

@ -720,8 +720,8 @@ pkgconf = configuration_data()
pkgconf.set('prefix', get_option('prefix')) pkgconf.set('prefix', get_option('prefix'))
pkgconf.set('exec_prefix', '${prefix}') pkgconf.set('exec_prefix', '${prefix}')
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) pkgconf.set('libdir', '${prefix}' / get_option('libdir'))
pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) pkgconf.set('includedir', '${prefix}' / get_option('includedir'))
pkgconf.set('GTK_API_VERSION', gtk_api_version) pkgconf.set('GTK_API_VERSION', gtk_api_version)
pkgconf.set('VERSION', meson.project_version()) pkgconf.set('VERSION', meson.project_version())
pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version)