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
This commit is contained in:
Jonas Ådahl 2018-11-07 14:29:30 +01:00
parent cf7c39e2c1
commit b86d87453d
6 changed files with 13 additions and 13 deletions

View File

@ -4,7 +4,7 @@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion} libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/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@ requires_private=@CLUTTER_REQUIRES_PRIVATE@
backends=@CLUTTER_BACKENDS@ backends=@CLUTTER_BACKENDS@

View File

@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion} libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion} includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@COGL_PKG_REQUIRES@ mutter-cogl-${apiversion}
Name: Cogl Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @MUTTER_VERSION@ Version: @MUTTER_VERSION@
Libs: -L${libdir} -lmutter-cogl-gles2-@LIBMUTTER_API_VERSION@ Libs: -L${libdir} -lmutter-cogl-gles2-${apiversion}
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

View File

@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion} libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion} includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@COGL_PKG_REQUIRES@ mutter-cogl-${apiversion}
Name: Cogl Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @MUTTER_VERSION@ Version: @MUTTER_VERSION@
Libs: -L${libdir} -lmutter-cogl-pango-@LIBMUTTER_API_VERSION@ Libs: -L${libdir} -lmutter-cogl-pango-${apiversion}
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

View File

@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion} libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion} includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@COGL_PKG_REQUIRES@ mutter-cogl-${apiversion}
Name: Cogl Name: Cogl
Description: A 2D path drawing library for Cogl Description: A 2D path drawing library for Cogl
Version: @MUTTER_VERSION@ Version: @MUTTER_VERSION@
Libs: -L${libdir} -lmutter-cogl-path-@LIBMUTTER_API_VERSION@ Libs: -L${libdir} -lmutter-cogl-path-${apiversion}
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

View File

@ -8,6 +8,6 @@ requires=@COGL_PKG_REQUIRES@
Name: Cogl Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @MUTTER_VERSION@ Version: @MUTTER_VERSION@
Libs: -L${libdir} -lmutter-cogl-@LIBMUTTER_API_VERSION@ Libs: -L${libdir} -lmutter-cogl-${apiversion}
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

View File

@ -2,13 +2,13 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
girdir=@libdir@/mutter
typelibdir=@libdir@/mutter
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
girdir=@libdir@/mutter-${apiversion}
typelibdir=@libdir@/mutter-${apiversion}
Name: libmutter Name: libmutter
Description: Mutter window manager library 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@ Version: @VERSION@
Libs: -L${libdir} -lmutter-@LIBMUTTER_API_VERSION@ Libs: -L${libdir} -lmutter-@${apiversion}
Cflags: -I${includedir}/mutter Cflags: -I${includedir}/mutter-@${apiversion}