From 531d90efc505e5dac6637ea5495dcbf3467cb13b Mon Sep 17 00:00:00 2001 From: "eric@webkit.org" Date: Wed, 19 May 2010 11:43:43 +0000 Subject: [PATCH] 2010-05-19 Dan Winship Reviewed by Xan Lopez. [GTK] Install introspection files in our prefix, not gobject-introspection's prefix * GNUmakefile.am: * configure.ac: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@59759 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 10 ++++++++++ GNUmakefile.am | 4 ++-- configure.ac | 5 ----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5403210..8629ada 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-05-19 Dan Winship + + Reviewed by Xan Lopez. + + [GTK] Install introspection files in our prefix, not + gobject-introspection's prefix + + * GNUmakefile.am: + * configure.ac: + 2010-05-15 Leandro Pereira Reviewed by Adam Treat. diff --git a/GNUmakefile.am b/GNUmakefile.am index b0ad9e9..39a3e51 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -453,10 +453,10 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la -I$(top_srcdir) \ $(webkitgtk_h_api) -girdir = $(GIRDIR) +girdir = $(datadir)/gir-1.0 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) -typelibsdir += $(GIRTYPELIBDIR) +typelibsdir += $(libdir)/girepository-1.0 typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(G_IR_COMPILER) diff --git a/configure.ac b/configure.ac index d45dd40..9757541 100644 --- a/configure.ac +++ b/configure.ac @@ -652,17 +652,12 @@ if test "$enable_introspection" = "yes"; then G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)" G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)" - GIRDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=girdir gobject-introspection-1.0)" - GIRTYPELIBDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=typelibdir gobject-introspection-1.0)" - AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support]) fi AC_SUBST([G_IR_SCANNER]) AC_SUBST([G_IR_COMPILER]) AC_SUBST([G_IR_GENERATE]) -AC_SUBST([GIRDIR]) -AC_SUBST([GIRTYPELIBDIR]) # determine the font backend AC_MSG_CHECKING([the font backend to use]) -- 1.8.3.1