[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the debian/unstable branch:
commit bdeb6bddbc4cf37b874b41d5b4e0be80fa2252d0
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 16:49:45 2010 +0000

    [Qt] Fix build problem related to the pushd command
    
    Reviewed by Simon Hausmann.
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d3187fb..85313a3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,14 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] Fix build problem related to the pushd command
+
+        * Scripts/webkitdirs.pm:
+
+2010-01-13  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Split the build process in two different .pro files.
         This allows qmake to be run once all source files are available.
 
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 1100b43..1611942 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1475,12 +1475,21 @@ sub buildQMakeProject($@)
     $dsMakefile .= ".Debug" if (isCygwin() || isWindows());
 
     print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/JavaScriptCore\n\n";
-    $result = system "pushd JavaScriptCore && $make $makeargs -f $dsMakefile generated_files && popd";
+    if ($make eq "nmake") {
+        $result = system "pushd JavaScriptCore && $make $makeargs -f $dsMakefile generated_files && popd";
+    } else {
+        $result = system "$make $makeargs -C JavaScriptCore -f $dsMakefile generated_files";
+    }
     if ($result ne 0) {
         die "Failed to generate JavaScriptCore's derived sources!\n";
     }
+
     print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/WebCore\n\n";
-    $result = system "pushd WebCore && $make $makeargs -f $dsMakefile generated_files && popd";
+    if ($make eq "nmake") {
+        $result = system "pushd WebCore && $make $makeargs -f $dsMakefile generated_files && popd";
+    } else {
+        $result = system "$make $makeargs -C WebCore -f $dsMakefile generated_files";
+    }
     if ($result ne 0) {
         die "Failed to generate WebCore's derived sources!\n";
     }

-- 
WebKit Debian packaging