summaryrefslogtreecommitdiff
path: root/engine/SCons/Platform/win32.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-01-23 15:07:01 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-01-23 15:07:01 +0100
commit5d815f9314d2a12f7e92e9cec33f0a9cf6b14883 (patch)
tree1db5deb3a8e5075d9a8abe3aae576ae00bab8e56 /engine/SCons/Platform/win32.py
parentbb7273665583fda5d0ddb30e969718984ea4c205 (diff)
parent7764805dd1d4df1cf1bdfe2ad1f2e130d91f515a (diff)
Merge commit 'upstream/1.2.0.d20100117'
Diffstat (limited to 'engine/SCons/Platform/win32.py')
-rw-r--r--engine/SCons/Platform/win32.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Platform/win32.py b/engine/SCons/Platform/win32.py
index 9ffa03e..649795a 100644
--- a/engine/SCons/Platform/win32.py
+++ b/engine/SCons/Platform/win32.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/win32.py 4577 2009/12/27 19:43:56 scons"
+__revision__ = "src/engine/SCons/Platform/win32.py 4629 2010/01/17 22:23:21 scons"
import os
import os.path
@@ -195,7 +195,7 @@ def get_system_root():
return _system_root
# A resonable default if we can't read the registry
- val = os.environ.get('SystemRoot', "C:/WINDOWS")
+ val = os.environ.get('SystemRoot', "C:\\WINDOWS")
if SCons.Util.can_read_reg:
try: