AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix build with system install of introspection

Browse Source 
Or redo it properly and remove previous hack by Matthias.
This commit is contained in:
Johan Dahlin 2009-12-31 01:19:13 +01:00 committed by Tristan Van Berkom
parent 753e30667f
commit e4ac9609a2
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -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
##################################################

4
gdk-pixbuf/Makefile.am
View File

@ -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)

4
gdk/Makefile.am
View File

@ -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)

4
gtk/Makefile.am
View File

@ -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)