Index: win/python.mak
===================================================================
--- win/python.mak	(revision 68289)
+++ win/python.mak	(working copy)
@@ -2,6 +2,10 @@
 
 TOOLS32 = $(VCINSTALLDIR)
 
+!ifndef DEBUG
+DEBUG = 0
+!endif
+
 !if $(DEBUG)
 BUILDDIRTOP = Debug
 NODEBUG = 0
@@ -26,6 +30,14 @@
 !endif
 !endif
 
+!ifndef MACHINE
+!if "$(CPU)" == "" || "$(CPU)" == "i386"
+MACHINE = IX86
+!else
+MACHINE = $(CPU)
+!endif
+!endif
+
 !if "$(MACHINE)" != "IX86"
 BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
 !endif