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

abecsi at webkit.org abecsi at webkit.org
Wed Dec 22 11:40:14 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6cc4409acfc3a011dda27563145c52e1fd04410b
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 12:36:43 2010 +0000

    2010-08-03  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            [Qt] Unreviewed typo fix in the WebKit2/DerivedSources.pro project file.
    
            Use QMAKE_MKDIR as the command for directory creation.
    
            * DerivedSources.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 602e619..d0bcdb4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-03  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        [Qt] Unreviewed typo fix in the WebKit2/DerivedSources.pro project file.
+
+        Use QMAKE_MKDIR as the command for directory creation.
+
+        * DerivedSources.pro:
+
 2010-08-02  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index f7cd243..80fb0a7 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -142,22 +142,15 @@ WEBKIT2_API_HEADERS += \
 QUOTE = ""
 DOUBLE_ESCAPED_QUOTE = ""
 ESCAPE = ""
-MKDIR = ""
-win32-msvc* {
+win32-msvc*|symbian {
     ESCAPE = "^"
-    MKDIR = md
-} else symbian {
-    ESCAPE = "^"
-    MKDIR = mkdir
 } else:win32-g++*:isEmpty(QMAKE_SH) {
     # MinGW's make will run makefile commands using sh, even if make
     #  was run from the Windows shell, if it finds sh in the path.
     ESCAPE = "^"
-    MKDIR = md
 } else {
     QUOTE = "\'"
     DOUBLE_ESCAPED_QUOTE = "\\\'"
-    MKDIR = mkdir
 }
 
 DIRS = \
@@ -166,7 +159,7 @@ DIRS = \
     $$OUTPUT_DIR/include/WebKit2
 
 for(DIR, DIRS) {
-    !exists($$DIR): system($$MKDIR $$DIR)
+    !exists($$DIR): system($$QMAKE_MKDIR $$DIR)
 }
 
 QMAKE_EXTRA_TARGETS += createdirs

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list