[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 24907cee153c76de382079861f480ea55e173728
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 00:21:55 2004 +0000

            Reviewed by me
    
            * copy-webcore-files-to-webkit: Made this file buildit-compliant
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6146 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 46bf192..324a2d9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-01  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me
+
+        * copy-webcore-files-to-webkit: Made this file buildit-compliant
+
 2004-03-01  Chris Blumenberg  <cblu at apple.com>
 
 	Found a bug in my last check-in. If a load that originates from a WebResource is cancelled before the data from the WebResource is delivered, callbacks are sent anyway. 
diff --git a/WebKit/copy-webcore-files-to-webkit b/WebKit/copy-webcore-files-to-webkit
index f16a1f8..db1490e 100755
--- a/WebKit/copy-webcore-files-to-webkit
+++ b/WebKit/copy-webcore-files-to-webkit
@@ -46,10 +46,15 @@ sub AssertInWebKit {
 
 sub AssertWebCoreFound {
 	my $path = cwd();
-	$path = dirname($path) . '/WebCore';
-	if (-d $path) {
+	my $localpath = dirname($path) . '/WebCore';
+	my $builditpath = dirname(dirname($path)) . '/WebCore.roots/WebCore';
+	if (-d $localpath) {
 		# ok...WebCore is where we expect it
-		$WebCorePath = $path;
+		$WebCorePath = $localpath;
+	}
+	if (-d $builditpath) {
+		# ok...WebCore is where we expect it
+		$WebCorePath = $builditpath;
 	}
 	else {
 		Fail("WebCore is not a sibling directory to WebKit. exiting...");

-- 
WebKit Debian packaging