Patch submitted by Toby Dickenson and approved by Mark Hammond.

Toby writes:

winmakemakefile.py tries to allow for spaces in the python install
path, by adding quotes around the appropriate filenames. It doesn't
quite get this correct; sometimes the quotes end up in the middle of
the path.

Microsoft's NMAKE version 6.0 is happy with this (!!!!)  unless there
is also a space in the name. I guess most users of freeze on windows
do not use the same path as the binary distribution.

I've tested the following changes on systems with and without a space
in the path.

diff --git a/Tools/freeze/winmakemakefile.py b/Tools/freeze/winmakemakefile.py
index 351e9cad95bac56c6341b951a53a5ef8b835f648..62ac6abfacbc4657ed4ac57c7e25ade17067fd81 100644 (file)
--- a/Tools/freeze/winmakemakefile.py
+++ b/Tools/freeze/winmakemakefile.py
@@ -53,7 +53,7 @@ def realwork(vars, moddefns, target):
     print "# Makefile for Microsoft Visual C++ generated by freeze.py script"
     print
     print 'target = %s' % target
-    print 'pythonhome = "%s"' % vars['prefix']
+    print 'pythonhome = %s' % vars['prefix']
     print
     print 'DEBUG=0 # Set to 1 to use the _d versions of Python.'
     print '!IF $(DEBUG)'
@@ -106,7 +106,7 @@ def realwork(vars, moddefns, target):
             objects.append(base + ".obj")
             print '$(temp_dir)\%s.obj: "%s"' % (base, file)
             print "\t@$(CC) -c -nologo /Fo$* $(cdl) $(c_debug) /D BUILD_FREEZE",
-            print "-I$(pythonhome)/Include  -I$(pythonhome)/PC \\"
+            print '"-I$(pythonhome)/Include"  "-I$(pythonhome)/PC" \\'
             print "\t\t$(cflags) $(cdebug) $(cinclude) \\"
             extra = moddefn.GetCompilerOptions()
             if extra: