diff options
| author | Mathieu Duponchelle <mathieu.duponchelle@opencreed.com> | 2015-05-19 18:25:00 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2015-07-17 15:21:14 +0200 |
| commit | f046b208417912c4d62d3600e4b0d074318e0422 (patch) | |
| tree | dc35b3fd999a4d27d9881848d1f28a8894c764a7 | |
| parent | 7e87137e3241047d40d4e93355ede27d33d0f7f8 (diff) | |
| download | grilo-f046b208417912c4d62d3600e4b0d074318e0422.tar.gz | |
introspection: Install to the correct places
make distcheck was failing on my end, because it sets a prefix
which has to be taken into account, this fixes that issue
as shown in the example in:
/usr/share/gobject-introspection-1.0/Makefile.introspection
https://bugzilla.gnome.org/show_bug.cgi?id=749587
| -rw-r--r-- | libs/net/Makefile.am | 4 | ||||
| -rw-r--r-- | libs/pls/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am index 4d2d291..277f095 100644 --- a/libs/net/Makefile.am +++ b/libs/net/Makefile.am @@ -71,10 +71,10 @@ GrlNet_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources) GrlNet_@GRL_MAJORMINOR_NORM@_gir_SCANNERFLAGS = --c-include="net/grl-net.h" INTROSPECTION_GIRS += GrlNet-@GRL_MAJORMINOR@.gir -girdir = @INTROSPECTION_GIRDIR@ +girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = @INTROSPECTION_TYPELIBDIR@ +typelibdir = $(libdir)/girepository-1.0/ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) diff --git a/libs/pls/Makefile.am b/libs/pls/Makefile.am index eec8a09..42178f2 100644 --- a/libs/pls/Makefile.am +++ b/libs/pls/Makefile.am @@ -62,10 +62,10 @@ GrlPls_@GRL_MAJORMINOR_NORM@_gir_LIBS = libgrlpls-@GRL_MAJORMINOR@.la \ GrlPls_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources) INTROSPECTION_GIRS += GrlPls-@GRL_MAJORMINOR@.gir -girdir = @INTROSPECTION_GIRDIR@ +girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = @INTROSPECTION_TYPELIBDIR@ +typelibdir = $(libdir)/girepository-1.0/ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index 5aaf1b9..1ecf809 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -146,10 +146,10 @@ Grl_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources) Grl_@GRL_MAJORMINOR_NORM@_gir_SCANNERFLAGS = --c-include="grilo.h" INTROSPECTION_GIRS += Grl-@GRL_MAJORMINOR@.gir -girdir = @INTROSPECTION_GIRDIR@ +girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = @INTROSPECTION_TYPELIBDIR@ +typelibdir = $(libdir)/girepository-1.0/ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) |