Commit 5955cfe3 authored by Johan Dahlin's avatar Johan Dahlin
Browse files

Fix build with system install of introspection

Or redo it properly and remove previous hack by Matthias.
parent c37c5752
......@@ -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
##################################################
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment