summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1999-06-21 22:36:53 (GMT)
committerGuido van Rossum <guido@python.org>1999-06-21 22:36:53 (GMT)
commit43128905befc05001219d79715448191a04b8ab9 (patch)
tree75bb6694ab03f7dd61f96b035bc753d5d29318ad
parent0f871dc39eef2adb0a24582fd5dfd6216822e286 (diff)
downloadcpython-43128905befc05001219d79715448191a04b8ab9.zip
cpython-43128905befc05001219d79715448191a04b8ab9.tar.gz
cpython-43128905befc05001219d79715448191a04b8ab9.tar.bz2
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.
-rw-r--r--Tools/freeze/winmakemakefile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/freeze/winmakemakefile.py b/Tools/freeze/winmakemakefile.py
index 351e9ca..62ac6ab 100644
--- 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: