From b86d87453d5ff7689101ea995d32cf8023b567ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 7 Nov 2018 14:29:30 +0100
Subject: [PATCH] build: Fix include and lib paths in autotools .pc files

Some hadn't been updated after lib/mutter/ changed to lib/mutter-N/.

Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/382
---
 clutter/clutter/mutter-clutter.pc.in    |  2 +-
 cogl/cogl-gles2/mutter-cogl-gles2.pc.in |  4 ++--
 cogl/cogl-pango/mutter-cogl-pango.pc.in |  4 ++--
 cogl/cogl-path/mutter-cogl-path.pc.in   |  4 ++--
 cogl/cogl/mutter-cogl.pc.in             |  2 +-
 src/libmutter.pc.in                     | 10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/clutter/clutter/mutter-clutter.pc.in b/clutter/clutter/mutter-clutter.pc.in
index 68ad77f77..6509dfc95 100644
--- a/clutter/clutter/mutter-clutter.pc.in
+++ b/clutter/clutter/mutter-clutter.pc.in
@@ -4,7 +4,7 @@ apiversion=@LIBMUTTER_API_VERSION@
 libdir=@libdir@/mutter-${apiversion}
 includedir=@includedir@/mutter-${apiversion}
 
-requires=@CLUTTER_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@CLUTTER_REQUIRES@ mutter-cogl-${apiversion}
 requires_private=@CLUTTER_REQUIRES_PRIVATE@
 backends=@CLUTTER_BACKENDS@
 
diff --git a/cogl/cogl-gles2/mutter-cogl-gles2.pc.in b/cogl/cogl-gles2/mutter-cogl-gles2.pc.in
index 8c8c3783a..d013ec64e 100644
--- a/cogl/cogl-gles2/mutter-cogl-gles2.pc.in
+++ b/cogl/cogl-gles2/mutter-cogl-gles2.pc.in
@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
 apiversion=@LIBMUTTER_API_VERSION@
 libdir=@libdir@/mutter-${apiversion}
 includedir=@includedir@/mutter-${apiversion}
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-${apiversion}
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
 Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-gles2-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-gles2-${apiversion}
 Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/cogl/cogl-pango/mutter-cogl-pango.pc.in b/cogl/cogl-pango/mutter-cogl-pango.pc.in
index 9c146b948..d0ab7c45f 100644
--- a/cogl/cogl-pango/mutter-cogl-pango.pc.in
+++ b/cogl/cogl-pango/mutter-cogl-pango.pc.in
@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
 apiversion=@LIBMUTTER_API_VERSION@
 libdir=@libdir@/mutter-${apiversion}
 includedir=@includedir@/mutter-${apiversion}
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-${apiversion}
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
 Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-pango-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-pango-${apiversion}
 Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/cogl/cogl-path/mutter-cogl-path.pc.in b/cogl/cogl-path/mutter-cogl-path.pc.in
index 6da697e86..5618bba9a 100644
--- a/cogl/cogl-path/mutter-cogl-path.pc.in
+++ b/cogl/cogl-path/mutter-cogl-path.pc.in
@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
 apiversion=@LIBMUTTER_API_VERSION@
 libdir=@libdir@/mutter-${apiversion}
 includedir=@includedir@/mutter-${apiversion}
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-${apiversion}
 
 Name: Cogl
 Description: A 2D path drawing library for Cogl
 Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-path-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-path-${apiversion}
 Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/cogl/cogl/mutter-cogl.pc.in b/cogl/cogl/mutter-cogl.pc.in
index 115d6a25f..797eef3d2 100644
--- a/cogl/cogl/mutter-cogl.pc.in
+++ b/cogl/cogl/mutter-cogl.pc.in
@@ -8,6 +8,6 @@ requires=@COGL_PKG_REQUIRES@
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
 Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-${apiversion}
 Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/src/libmutter.pc.in b/src/libmutter.pc.in
index d2e837f4a..7ac62afc1 100644
--- a/src/libmutter.pc.in
+++ b/src/libmutter.pc.in
@@ -2,13 +2,13 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-girdir=@libdir@/mutter
-typelibdir=@libdir@/mutter
 apiversion=@LIBMUTTER_API_VERSION@
+girdir=@libdir@/mutter-${apiversion}
+typelibdir=@libdir@/mutter-${apiversion}
 
 Name: libmutter
 Description: Mutter window manager library
-Requires: gsettings-desktop-schemas gtk+-3.0 mutter-clutter-@LIBMUTTER_API_VERSION@ x11
+Requires: gsettings-desktop-schemas gtk+-3.0 mutter-clutter-${apiversion} x11
 Version: @VERSION@
-Libs: -L${libdir} -lmutter-@LIBMUTTER_API_VERSION@
-Cflags: -I${includedir}/mutter
+Libs: -L${libdir} -lmutter-@${apiversion}
+Cflags: -I${includedir}/mutter-@${apiversion}