Makefile: fix windows issues

This commit is contained in:
Brian Warner 2008-09-11 22:09:19 -07:00
parent 3035c6bcf1
commit 0afe7afac0
2 changed files with 7 additions and 6 deletions

View File

@ -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:

View File

@ -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