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

[sfalken at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit f8ff783bf0535d5923e8a05e2ac7518bb375afcf
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 17:56:38 2010 +0000

    Windows build fix for projects not defining WebKitLibrariesDir.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 4f8f848..b32ffa8 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-04  Steve Falkenburg  <sfalken at apple.com>
+
+        Windows build fix for projects not defining WebKitLibrariesDir.
+
+        * win/tools/scripts/auto-version.sh:
+
 2010-02-03  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index cbdc1af..6d629f9 100755
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -32,14 +32,17 @@ chomp()
     eval $1=\$value;
 }
 
-FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"`
+if [ "$WEBKITLIBRARIESDIR" != "" ]; then
+    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"`
+    FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
+fi
+
 OUTPUT_FILE=$(cygpath -u "$1")/include/autoversion.h
 mkdir -p "$(dirname "$OUTPUT_FILE")"
 
 # Take the initial version number from RC_PROJECTSOURCEVERSION if it
 # exists, otherwise fall back to the version number stored in the source.
 ENVIRONMENT_VERSION="$RC_PROJECTSOURCEVERSION";
-FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
 PROPOSED_VERSION=${ENVIRONMENT_VERSION:-$FALLBACK_VERSION}
 chomp PROPOSED_VERSION
 

-- 
WebKit Debian packaging