mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 08:00:42 -05:00
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:
parent
3693f6f630
commit
d360b25b81
@ -634,6 +634,7 @@ pkg.generate(libmutter_clutter,
|
|||||||
variables: [
|
variables: [
|
||||||
'apiversion=' + libmutter_api_version,
|
'apiversion=' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
|
||||||
pkg.generate(libmutter_clutter,
|
pkg.generate(libmutter_clutter,
|
||||||
@ -647,4 +648,5 @@ pkg.generate(libmutter_clutter,
|
|||||||
variables: [
|
variables: [
|
||||||
'apiversion=' + libmutter_api_version,
|
'apiversion=' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
@ -37,4 +37,5 @@ pkg.generate(libmutter_cogl_gles2,
|
|||||||
variables: [
|
variables: [
|
||||||
'apiversion=' + libmutter_api_version,
|
'apiversion=' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
@ -77,4 +77,5 @@ pkg.generate(libmutter_cogl_pango,
|
|||||||
variables: [
|
variables: [
|
||||||
'apiversion=' + libmutter_api_version,
|
'apiversion=' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
@ -78,4 +78,5 @@ pkg.generate(libmutter_cogl_path,
|
|||||||
variables: [
|
variables: [
|
||||||
'apiversion=' + libmutter_api_version,
|
'apiversion=' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
@ -528,4 +528,5 @@ pkg.generate(libmutter_cogl,
|
|||||||
variables: [
|
variables: [
|
||||||
'apiversion=' + libmutter_api_version,
|
'apiversion=' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
@ -65,6 +65,8 @@ pkgdatadir = join_paths(datadir, pkgname)
|
|||||||
pkglibdir = join_paths(libdir, pkgname)
|
pkglibdir = join_paths(libdir, pkgname)
|
||||||
pkgincludedir = join_paths(includedir, pkgname)
|
pkgincludedir = join_paths(includedir, pkgname)
|
||||||
|
|
||||||
|
pcdir = join_paths(libdir, 'pkgconfig')
|
||||||
|
|
||||||
gettext_package = meson.project_name()
|
gettext_package = meson.project_name()
|
||||||
localedir = join_paths(datadir, 'locale')
|
localedir = join_paths(datadir, 'locale')
|
||||||
|
|
||||||
|
@ -841,6 +841,7 @@ pkg.generate(libmutter,
|
|||||||
'girdir=${libdir}/mutter-' + libmutter_api_version,
|
'girdir=${libdir}/mutter-' + libmutter_api_version,
|
||||||
'typelibdir=${libdir}/mutter-' + libmutter_api_version,
|
'typelibdir=${libdir}/mutter-' + libmutter_api_version,
|
||||||
],
|
],
|
||||||
|
install_dir: pcdir,
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('compositor/plugins')
|
subdir('compositor/plugins')
|
||||||
|
Loading…
Reference in New Issue
Block a user