From 5955cfe37fbe81ca1b9c660254db3ecedc92827a Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Thu, 31 Dec 2009 01:19:13 +0100 Subject: Fix build with system install of introspection Or redo it properly and remove previous hack by Matthias. --- configure.in | 6 ------ gdk-pixbuf/Makefile.am | 4 ++-- gdk/Makefile.am | 4 ++-- gtk/Makefile.am | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index e64e7cf0fa..f715189a70 100644 --- 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 4384372c6f..7c2407b78d 100644 --- 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 876b5f45b3..1d3ece423d 100644 --- 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 ff6141d48d..2a2db02379 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -993,10 +993,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) -- cgit v1.2.1