build: Install .pc files in correct location

If a library is provided in the positional arguments, then meson
defaults to installing the .pc file in a 'pkgconfig' subdirectory
in the library's install location. We want the files in the regular
$libdir/pkgconfig rather than $libdir/mutter-$api/pkgconfig, so
specify the location explicitly in the parameters.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/382
This commit is contained in:
Florian Müllner 2019-01-08 22:28:18 +01:00
parent 3693f6f630
commit d360b25b81
7 changed files with 9 additions and 0 deletions

View File

@ -634,6 +634,7 @@ pkg.generate(libmutter_clutter,
variables: [
'apiversion=' + libmutter_api_version,
],
install_dir: pcdir,
)
pkg.generate(libmutter_clutter,
@ -647,4 +648,5 @@ pkg.generate(libmutter_clutter,
variables: [
'apiversion=' + libmutter_api_version,
],
install_dir: pcdir,
)

View File

@ -37,4 +37,5 @@ pkg.generate(libmutter_cogl_gles2,
variables: [
'apiversion=' + libmutter_api_version,
],
install_dir: pcdir,
)

View File

@ -77,4 +77,5 @@ pkg.generate(libmutter_cogl_pango,
variables: [
'apiversion=' + libmutter_api_version,
],
install_dir: pcdir,
)

View File

@ -78,4 +78,5 @@ pkg.generate(libmutter_cogl_path,
variables: [
'apiversion=' + libmutter_api_version,
],
install_dir: pcdir,
)

View File

@ -528,4 +528,5 @@ pkg.generate(libmutter_cogl,
variables: [
'apiversion=' + libmutter_api_version,
],
install_dir: pcdir,
)

View File

@ -65,6 +65,8 @@ pkgdatadir = join_paths(datadir, pkgname)
pkglibdir = join_paths(libdir, pkgname)
pkgincludedir = join_paths(includedir, pkgname)
pcdir = join_paths(libdir, 'pkgconfig')
gettext_package = meson.project_name()
localedir = join_paths(datadir, 'locale')

View File

@ -841,6 +841,7 @@ pkg.generate(libmutter,
'girdir=${libdir}/mutter-' + libmutter_api_version,
'typelibdir=${libdir}/mutter-' + libmutter_api_version,
],
install_dir: pcdir,
)
subdir('compositor/plugins')