From d360b25b8194aa1d37d41afae08c84e5b43fb303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 8 Jan 2019 22:28:18 +0100
Subject: [PATCH] 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
---
 clutter/clutter/meson.build | 2 ++
 cogl/cogl-gles2/meson.build | 1 +
 cogl/cogl-pango/meson.build | 1 +
 cogl/cogl-path/meson.build  | 1 +
 cogl/cogl/meson.build       | 1 +
 meson.build                 | 2 ++
 src/meson.build             | 1 +
 7 files changed, 9 insertions(+)

diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 4d6d6d33e..5b7e33b67 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -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,
 )
diff --git a/cogl/cogl-gles2/meson.build b/cogl/cogl-gles2/meson.build
index 3794d779b..4d5ffb463 100644
--- a/cogl/cogl-gles2/meson.build
+++ b/cogl/cogl-gles2/meson.build
@@ -37,4 +37,5 @@ pkg.generate(libmutter_cogl_gles2,
   variables: [
     'apiversion=' + libmutter_api_version,
   ],
+  install_dir: pcdir,
 )
diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build
index 6affbfcf6..c104112bf 100644
--- a/cogl/cogl-pango/meson.build
+++ b/cogl/cogl-pango/meson.build
@@ -77,4 +77,5 @@ pkg.generate(libmutter_cogl_pango,
   variables: [
     'apiversion=' + libmutter_api_version,
   ],
+  install_dir: pcdir,
 )
diff --git a/cogl/cogl-path/meson.build b/cogl/cogl-path/meson.build
index fe9395f97..03b09a58d 100644
--- a/cogl/cogl-path/meson.build
+++ b/cogl/cogl-path/meson.build
@@ -78,4 +78,5 @@ pkg.generate(libmutter_cogl_path,
   variables: [
     'apiversion=' + libmutter_api_version,
   ],
+  install_dir: pcdir,
 )
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 8501af963..c25ad75fa 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -528,4 +528,5 @@ pkg.generate(libmutter_cogl,
   variables: [
     'apiversion=' + libmutter_api_version,
   ],
+  install_dir: pcdir,
 )
diff --git a/meson.build b/meson.build
index 2ca0b4020..ce233af58 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
 
diff --git a/src/meson.build b/src/meson.build
index 71555c62a..3eb7e72d3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -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')