[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 83a2978aef96fb2b07be26e768491f18993757c4
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 10:15:31 2010 +0000

    [Qt] Fix the recursive generated_files target to work with qmake -r -o
    
    Patch by Jocelyn Turcotte <jocelyn.turcotte at nokia.com> on 2010-01-20
    Reviewed by Simon Hausmann.
    
    * DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d669ebc..36d8daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-20  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the recursive generated_files target to work with qmake -r -o
+
+        * DerivedSources.pro:
+
 2010-01-20  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index 54845c3..59edaa5 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -8,7 +8,7 @@ SUBDIRS += \
 for(subpro, SUBDIRS) {
     subdir = $${dirname(subpro)}
     subtarget = $$replace(subdir, [^A-Za-z0-9], _)
-    eval(generated_files-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE).DerivedSources generated_files))
+    eval(generated_files-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f Makefile.DerivedSources generated_files))
     QMAKE_EXTRA_TARGETS += generated_files-$${subtarget}
     generated_files.depends += generated_files-$${subtarget}
 }

-- 
WebKit Debian packaging