4 files changed, 12 insertions, 10 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index f314da9..1952c93 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -257,9 +257,9 @@ env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
 # directory tree as a huge content-signature string.
 # Instead we're going to let all the subsidiary SConscript files
 # add their own individual targets to the 'webkit' Alias.
-#env.Alias('webkit', ['.', '../icudt38.dll'])
+#env.Alias('webkit', ['.', '$OBJ_ROOT/icudt38.dll'])
 if env['PLATFORM'] == 'win32':
-  env.Alias('webkit', ['../icudt38.dll'])
+  env.Alias('webkit', ['$OBJ_ROOT/icudt38.dll'])
 
 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
                       ['$WEBCORE_DIR/Configurations/Version.xcconfig',
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 103c032..08a684b 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -7,9 +7,9 @@ Import('env')
 env = env.Clone()
 
 
-cygwin = Dir('#../third_party/cygwin/bin')
+cygwin = env.Dir('$CHROME_SRC_DIR/third_party/cygwin/bin')
 cygwin_posix = cygwin.abspath.replace('\\', '/')
-env.PrependENVPath('PATH', '../third_party/cygwin/bin')
+env.PrependENVPath('PATH', cygwin_posix)
 
 
 hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $TARGET'
@@ -50,7 +50,7 @@ env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table',
 # TODO(bradnelson): sucks, needs relative path
 env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c',
             '$PCRE_DIR/dftables',
-            '$PERL ../third_party/WebKit/JavaScriptCore/pcre/dftables ' + \
+            '$PERL $CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre/dftables ' + \
             '${TARGET.posix}')
 
 # We'd like to do this as follows:
@@ -75,6 +75,8 @@ copies = [
     'API/JSStringRefCF.h',
     'API/JSStringRefBSTR.h',
     'API/JavaScriptCore.h',
+    # NOTE: these work ok for now with relative paths because they are concated
+    # with JAVASCRIPT_CORE_DIR down below.
     '../WebCore/bridge/npruntime.h',
     '../WebCore/bridge/runtime.h',
     '../WebCore/bridge/NP_jsobject.h',
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 6a90652..748f24d 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -763,7 +763,7 @@ if env['PLATFORM'] == 'win32':
 if env['PLATFORM'] == 'win32':
   env_p = env.Clone()
   env_p.Append(CCFLAGS='/Ylwebcore')
-  pch, obj = env_p.PCH('../precompiled_webkit.cc')
+  pch, obj = env_p.PCH('$OBJ_ROOT/build/precompiled_webkit.cc')
   env['PCH'] = pch
   env['PCHSTOP'] = 'precompiled_webkit.h'
   env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index cc9b462..53d3741 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -7,15 +7,15 @@ import re
 
 Import('env')
 
-webcore = env.Dir('#../third_party/WebKit/WebCore')
+webcore = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore')
 webcore_posix = webcore.abspath.replace('\\', '/')
 
 cygwin = env.Dir('$CYGWIN_DIR/bin')
 cygwin_posix = cygwin.abspath.replace('\\', '/')
 
-pending = env.Dir('#../webkit/pending')
-portroot = env.Dir('#../webkit/port')
-webkit_build = env.Dir('#../webkit/build')
+pending = env.Dir('$CHROME_SRC_DIR/webkit/pending')
+portroot = env.Dir('$CHROME_SRC_DIR/webkit/port')
+webkit_build = env.Dir('$CHROME_SRC_DIR/webkit/build')
 
 
 def PosixIncludes(env, prefix, files, suffix):