Fix build with system install of introspection

Or redo it properly and remove previous hack by Matthias.

diff --git a/configure.in b/configure.in
index e64e7cf0fa29365e67af0766c2e493f2ddaabbd1..f715189a7063bceb6142c434e83bc2c15515d5d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1979,12 +1979,6 @@ fi
 
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
-# Hack around introspection installing into an absolute path breaking distcheck
-tmp=`pkg-config --variable=datadir gobject-introspection-1.0`
-INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$tmp/\$(datadir)}
-tmp=`pkg-config --variable=libdir gobject-introspection-1.0`
-INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$tmp/\$(libdir)}
-
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 4384372c6f5b89f176d45cdfcca7dece98140f19..7c2407b78db3a2b2e32a829e53e4dfff75a61809 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -700,10 +700,10 @@ GdkPixbuf_2_0_gir_FILES = \
     $(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
 INTROSPECTION_GIRS += GdkPixbuf-2.0.gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 876b5f45b340ef6e30be8068d3b6c7d811f6f955..1d3ece423d1487aa1192f839595919252050dd79 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -207,10 +207,10 @@ Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
 Gdk_2_0_gir_CFLAGS = $(INCLUDES)
 INTROSPECTION_GIRS += Gdk-2.0.gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bfefb4a8a807cfd8a8eb998b61ef12e6b2242239..63742266b9aac43153ebccd941b7c721d13ca59e 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -995,10 +995,10 @@ Gtk_2_0_gir_LIBS = $(gtktargetlib)
 Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
 INTROSPECTION_GIRS += Gtk-2.0.gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)