diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2018-07-17 12:39:57 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-11-06 17:17:36 +0100 |
| commit | d48d56f8314e6789ccfff2c269509da728c44db3 (patch) | |
| tree | a51b8f572e55c1971b7965a869694c17f9536342 /cogl/cogl-pango | |
| parent | 32f3bb02e12ffd754d049c8823ec7bf8a75a278f (diff) | |
| download | mutter-d48d56f8314e6789ccfff2c269509da728c44db3.tar.gz | |
autotools: Make install directories paths more consistent
Install include files in
$prefix/include/mutter-$apiversion/[clutter,cogl,...,meta]/, and
datafiles in /usr/share/mutter-$apiversion/.... We still would conflict
e.g. given that our gettext name is "mutter", and how keybindings are
installed, but it's a step in the right direction.
Diffstat (limited to 'cogl/cogl-pango')
| -rw-r--r-- | cogl/cogl-pango/Makefile.am | 4 | ||||
| -rw-r--r-- | cogl/cogl-pango/mutter-cogl-pango.pc.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cogl/cogl-pango/Makefile.am b/cogl/cogl-pango/Makefile.am index b89877d0f..bc23c16d1 100644 --- a/cogl/cogl-pango/Makefile.am +++ b/cogl/cogl-pango/Makefile.am @@ -22,7 +22,7 @@ source_h_priv = \ cogl-pango-pipeline-cache.h \ $(NULL) -mutterlibdir = $(libdir)/mutter +mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@ mutterlib_LTLIBRARIES = libmutter-cogl-pango-@LIBMUTTER_API_VERSION@.la libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_priv) @@ -45,7 +45,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) -cogl_base_includedir = $(includedir)/mutter +cogl_base_includedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@ cogl_pangoheadersdir = $(cogl_base_includedir)/cogl/cogl-pango cogl_pangoheaders_HEADERS = $(source_h) diff --git a/cogl/cogl-pango/mutter-cogl-pango.pc.in b/cogl/cogl-pango/mutter-cogl-pango.pc.in index da12c94fb..9c146b948 100644 --- a/cogl/cogl-pango/mutter-cogl-pango.pc.in +++ b/cogl/cogl-pango/mutter-cogl-pango.pc.in @@ -1,8 +1,8 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@/mutter -includedir=@includedir@/mutter apiversion=@LIBMUTTER_API_VERSION@ +libdir=@libdir@/mutter-${apiversion} +includedir=@includedir@/mutter-${apiversion} requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ Name: Cogl |