From: Brian Warner Date: Fri, 12 Sep 2008 05:21:51 +0000 (-0700) Subject: windows/Makefile: fix dependencies: windows-installer must cause windows-exe to run X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/css/flags/?a=commitdiff_plain;h=616b950869625bb5118961cd76b193963083e73e;p=tahoe-lafs%2Ftahoe-lafs.git windows/Makefile: fix dependencies: windows-installer must cause windows-exe to run --- diff --git a/windows/Makefile b/windows/Makefile index 600c0d7f..761199c6 100644 --- 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