windows/Makefile: fix dependencies: windows-installer must cause windows-exe to run

diff --git a/windows/Makefile b/windows/Makefile
index 600c0d7fda79cdd2e46e3e2407e98eee0a64fc6b..761199c6da0d0550b2ab776055dd540c618a03a6 100644 (file)
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -3,12 +3,19 @@
 # control it, since 'PYTHON=foo make windows-exe' doesn't seem to override
 # the default.
 
+# We also get $(PYTHONPATH) from our parent, which is critical for py2exe to
+# find the tahoe code. Invoking this Makefile directly won't work.
+
 INNOSETUP := $(shell cygpath -au "$(PROGRAMFILES)/Inno Setup 5/Compil32.exe")
 
-windows-exe:
+.PHONY: windows-exe windows-installer windows-installer-upload
+
+windows-exe.stamp:
        $(PYTHON) setup.py py2exe
+       touch windows-exe.stamp
+windows-exe: windows-exe.stamp
 
-windows-installer:
+windows-installer: windows-exe.stamp
        $(PYTHON) ../misc/sub-ver.py installer.tmpl >installer.iss
        "$(INNOSETUP)" /cc installer.iss