Makefile: fix windows issues

[tahoe-lafs/tahoe-lafs.git] / windows / Makefile

diff --git a/windows/Makefile b/windows/Makefile
index 702ecc0555a9c8ecb752cf00194aee3b7a78c7d4..600c0d7fda79cdd2e46e3e2407e98eee0a64fc6b 100644 (file)
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -1,16 +1,16 @@
 
 # we get $(PYTHON) from our parent, do 'make windows-exe PYTHON=foo' to
-# control it, since 'PYTHON=foo make windows-exe' doesn't seem to trigger the
-# export.
+# control it, since 'PYTHON=foo make windows-exe' doesn't seem to override
+# the default.
 
 INNOSETUP := $(shell cygpath -au "$(PROGRAMFILES)/Inno Setup 5/Compil32.exe")
 
 windows-exe:
        $(PYTHON) setup.py py2exe
 
-windows-installer: windows-exe
-       $(PYTHON) ../sub-ver.py installer.tmpl >installer.iss
-       $(INNOSETUP) /cc installer.iss
+windows-installer:
+       $(PYTHON) ../misc/sub-ver.py installer.tmpl >installer.iss
+       "$(INNOSETUP)" /cc installer.iss
 
 windows-installer-upload:
        chmod -R o+rx dist/installer