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.
This commit is contained in:
Jonas Ådahl
2018-07-17 12:39:57 +02:00
parent 32f3bb02e1
commit d48d56f831
14 changed files with 31 additions and 26 deletions

View File

@ -1,6 +1,9 @@
# Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
.AUTOPARALLEL:
pkgdatadir = $(datadir)/mutter-$(LIBMUTTER_API_VERSION)
pkglibdir = $(libdir)/mutter-$(LIBMUTTER_API_VERSION)
lib_LTLIBRARIES = libmutter-@LIBMUTTER_API_VERSION@.la
SUBDIRS=compositor/plugins
@ -586,7 +589,7 @@ libmutterinclude_base_headers = \
$(libmutterinclude_headers) \
$(libmutterinclude_built_headers)
libmutterincludedir = $(includedir)/mutter/meta
libmutterincludedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@/meta
libmutterinclude_HEADERS = \
$(libmutterinclude_headers)

View File

@ -1,5 +1,5 @@
pkglibdir = $(MUTTER_PLUGIN_DIR)
pkgdatadir = $(datadir)/mutter-$(LIBMUTTER_API_VERSION)
pkglibdir = $(libdir)/mutter-$(LIBMUTTER_API_VERSION)
AM_CPPFLAGS = \
$(MUTTER_CFLAGS) \