Makefile: fix windows issues

diff --git a/Makefile b/Makefile
index c47f8ae6691150e0cf84d261ea94a6b796812d97..8f605ed6692acf41f726db2c9f8fc26119c41081 100644 (file)
--- 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 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