3 files changed, 8 insertions, 7 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index f2a8269..e1dfe0c 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -17,7 +17,7 @@ env_res.Append(
     CPPPATH = [
         "$TARGET_ROOT",
         ".",
-        "#/..",
+        "$CHROME_SRC_DIR",
     ],
     RCFLAGS = [
         ["/l", "0x409"],
@@ -31,7 +31,7 @@ env.Prepend(
     CPPPATH = [
         '$GTEST_DIR/include',
         '$GTEST_DIR',
-        '#/..',
+        '$CHROME_SRC_DIR',
     ],
     CCFLAGS = [
         '/TP',
@@ -109,7 +109,7 @@ env_test.Prepend(
     CPPPATH = [
         '$GTEST_DIR/include',
         '$GTEST_DIR',
-        '#/..',
+        '$CHROME_SRC_DIR',
     ],
     LIBS = [
         'gtest',
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index a920f31..edd5a3e 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -12,7 +12,7 @@ env_res.Append(
   CPPPATH = [
     "$TARGET_ROOT",
     ".",
-    "#/..",
+    "$CHROME_SRC_DIR",
   ],
   RCFLAGS = [
     ["/l", "0x409"],
@@ -30,7 +30,7 @@ env.Prepend(
         '../util',
         '$TARGET_ROOT',
         '.',
-        '#/..',
+        '$CHROME_SRC_DIR',
     ],
     LIBS = [
         'base',
diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript
index 706cff9..fde62a7a 100644
--- a/chrome/installer/util/SConscript
+++ b/chrome/installer/util/SConscript
@@ -22,7 +22,7 @@ env.Prepend(
         '$LIBJPEG_DIR',
         '$ICU38_DIR/public/common',
         '$ICU38_DIR/public/i18n',
-        '#/..',
+        '$CHROME_SRC_DIR',
         '.',
     ],
     CPPDEFINES = [
@@ -66,7 +66,8 @@ x = env.ChromeStaticLibrary('util', input_files)
 # create_string_rc.py imports FP.py from the tools/grit/grit/extern
 # directory, so add that to PYTHONPATH for this command execution.
 env_x = env.Clone()
-env_x.AppendENVPath('PYTHONPATH', [Dir('#/../tools/grit/grit/extern').abspath])
+env_x.AppendENVPath('PYTHONPATH',
+    [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath])
 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc',
                '$CHROME_DIR/installer/util/installer_util_strings.h'],
               ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py',