From ccd0f015843bfac6aeed4e7988b8c1621ed9a1ad Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 17 Feb 2012 20:30:15 +0000
Subject: [PATCH] Fixed a python-distutils problem with the Windows SDK

---
 src/python/SConscript | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/python/SConscript b/src/python/SConscript
index 0bc63fde1..6036e8e6e 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -55,14 +55,15 @@ else:
     # Install Python module in the default location
     extra = ''
 
+if 'MSSdk' in os.environ:
+    localenv['ENV']['DISTUTILS_USE_SDK'] = '1'
+    localenv['ENV']['MSSdk'] = os.environ['MSSdk']
+
 if localenv['PYTHON_INSTALLER'] == 'direct':
     inst = localenv.Command('dummy', pymodule,
                             'cd %s && $python_cmd setup.py install %s' % (moddir,extra))
     installTargets.extend(inst)
 elif localenv['PYTHON_INSTALLER'] == 'binary':
-    if 'MSSdk' in os.environ:
-        localenv['ENV']['DISTUTILS_USE_SDK'] = '1'
-        localenv['ENV']['MSSdk'] = os.environ['MSSdk']
     inst = localenv.Command('dummy', pymodule,
                             'cd %s && $python_cmd setup.py bdist_msi --dist-dir=../..' % moddir)
     installTargets.extend(inst)