[tor-commits] [flashproxy/master] Merge branch 'py2exe'

[dcf at torproject.org]

commit 85bd1046c92cd13a58a32dd38a7f3046c8d7ee33
Merge: 64eee6e 011ea65
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 14 23:33:11 2013 -0700

    Merge branch 'py2exe'

 .gitignore                       |    2 +-
 Makefile                         |   20 +++++++-------------
 doc/bundle-windows.txt           |   11 +++++------
 doc/windows-deployment-howto.txt |   23 ++++-------------------
 flashproxy-client                |    8 ++++++--
 setup.py                         |   18 ++++++++++++++++++
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --cc Makefile
index 330e4dc,3d843f1..9483f75
--- a/Makefile
+++ b/Makefile
@@@ -5,10 -5,9 +5,9 @@@ BINDIR = $(PREFIX)/bi
  MANDIR = $(PREFIX)/share/man
  
  PYTHON = python
- PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py
- export PYINSTALLER_TMPDIR = pyinstaller-tmp
+ export PY2EXE_TMPDIR = py2exe-tmp
  
 -CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http
 +CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http flashproxy-reg-url
  CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1
  CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc
  CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.GPL doc/LICENSE.PYTHON