From: Brian Warner <warner@allmydata.com>
Date: Fri, 12 Sep 2008 05:09:19 +0000 (-0700)
Subject: Makefile: fix windows issues
X-Git-Url: https://git.rkrishnan.org/%3C?a=commitdiff_plain;h=0afe7afac0abb100a471833aaeb24182271edeab;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: fix windows issues
---

diff --git a/Makefile b/Makefile
index c47f8ae6..8f605ed6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@
 default: build
 
 PYTHON=python
+export PYTHON
 
 # setup.py will extend sys.path to include our support/lib/... directory
 # itself. It will also create it in the beginning of the 'develop' command.
@@ -360,7 +361,7 @@ deb-hardy-head:
 windows-exe: .built
 	$(RUNPP) -c "$(MAKE) -C windows windows-exe"
 
-windows-installer: windows-exe
+windows-installer:
 	$(RUNPP) -c "$(MAKE) -C windows windows-installer"
 
 windows-installer-upload:
diff --git a/windows/Makefile b/windows/Makefile
index 702ecc05..600c0d7f 100644
--- 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