[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ab77e5a78da34d3571fe3fcbe5aa39251b4c8874
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 07:45:31 2010 +0000

    [Qt] Make 'make -f Makefile.DerivedSources qmake' work
    
    Reviewed by Lars Knoll.
    
    Previously this target ended up generating a file named
    Makefile.DerivedSources.DerivedSources, and so on.
    
    * DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index c57e5e0..f8d081d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-04  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Lars Knoll.
+
+        [Qt] Make 'make -f Makefile.DerivedSources qmake' work
+
+        Previously this target ended up generating a file named
+        Makefile.DerivedSources.DerivedSources, and so on.
+
+        * DerivedSources.pro:
+
 2010-02-04  Christian Dywan  <christian at twotasts.de>
 
         Reviewed by Xan Lopez.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index 59edaa5..adb17eb 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -7,7 +7,8 @@ SUBDIRS += \
 
 for(subpro, SUBDIRS) {
     subdir = $${dirname(subpro)}
-    subtarget = $$replace(subdir, [^A-Za-z0-9], _)
+    subtarget = $$replace(subpro, [^a-zA-Z0-9_], -)
+    eval($${subtarget}.makefile = "Makefile.DerivedSources")
     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