[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit baa76e9e121004d9bc78b0012d6f050668a49fc9
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 12:09:59 2010 +0000

    2010-12-09  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Fix 'make install' woes with some versions of automake.
    
            * GNUmakefile.am: use $(top_builddir) instead of $(builddir),
            since we actually want a valid path for the file regardless of the
            place from where the script is called.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 5aa5e8c..9fcfd4a 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-09  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Fix 'make install' woes with some versions of automake.
+
+        * GNUmakefile.am: use $(top_builddir) instead of $(builddir),
+        since we actually want a valid path for the file regardless of the
+        place from where the script is called.
+
 2010-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Build fix. Take webView{Enter,Exit}Fullscreen back out of the
diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
index a846f7f..bccbd5a 100644
--- a/WebKit/gtk/GNUmakefile.am
+++ b/WebKit/gtk/GNUmakefile.am
@@ -203,8 +203,8 @@ pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME at -@WEBKITGTK_API_VERSION at .pc
 
 if ENABLE_INTROSPECTION
 
-JSCore- at WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir
-	$(AM_V_GEN)cp $(builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir $(builddir)/
+JSCore- at WEBKITGTK_API_VERSION@.gir: $(top_builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir
+	$(AM_V_GEN)cp $(top_builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir $(top_builddir)/
 
 JSCORE_GIRSOURCES += JSCore- at WEBKITGTK_API_VERSION@.gir
 WEBKIT_GIRSOURCES += WebKit- at WEBKITGTK_API_VERSION@.gir
@@ -226,12 +226,12 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk- at WEBKITG
 	     --pkg=libsoup-2.4 \
 	     --output=$@ \
 	     --add-include-path=$(WebKit) \
-	     --add-include-path=$(builddir) \
+	     --add-include-path=$(top_builddir) \
 	     -I$(top_srcdir)/WebCore/platform/network/soup/cache \
 	     -I$(WebKit) \
 	     -I$(GENSOURCES) \
 	     -I$(GENSOURCES_WEBKIT) \
-	     -I$(builddir)/WebKit/gtk \
+	     -I$(top_builddir)/WebKit/gtk \
 	     -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
 	     -I$(top_srcdir) \
 	     $(GENSOURCES_WEBKIT)/webkitenumtypes.h \
@@ -246,13 +246,13 @@ typelibsdir += $(libdir)/girepository-1.0
 typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(G_IR_COMPILER)
-	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(builddir) $< -o $@
+	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
 
 CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
 
 endif
 
-EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir
+EXTRA_DIST += $(top_builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir
 
 WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
 $(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp

-- 
WebKit Debian packaging