[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 689120a2c15d80b62694fb5e0969479f9ba8b6c1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 2 22:26:00 2009 +0000

    2009-11-02  Estêvão Samuel Procópio  <tevaum at gmail.com>
    
            Reviewed by Gustavo Noronha.
    
            [Build] make install ignores --prefix option for gobject-introspection.
            https://bugs.webkit.org/show_bug.cgi?id=31025
    
            Make the build system use the --prefix path also when installing
            gobject-introspection files.
    
            * configure.ac: use --prefix path in GITDIR and GIRTYPELIBDIR
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 24b4f03..c5231a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-02  Estêvão Samuel Procópio  <tevaum at gmail.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [Build] make install ignores --prefix option for gobject-introspection.
+        https://bugs.webkit.org/show_bug.cgi?id=31025
+
+        Make the build system use the --prefix path also when installing
+        gobject-introspection files.
+
+        * configure.ac: use --prefix path in GITDIR and GIRTYPELIBDIR
+
 2009-11-02  Xan Lopez  <xlopez at igalia.com>
 
         Bump version before release (or post-release, depending on your
diff --git a/configure.ac b/configure.ac
index da2850a..5b80fa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,8 +588,8 @@ 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 --variable=girdir gobject-introspection-1.0)"
-  GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir 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

-- 
WebKit Debian packaging