[tor-commits] [flashproxy/master] Install flashproxy-reg-appspot.

[dcf at torproject.org]

commit 1e66d3bb09c569cf0c584449be07c0622cd2e3aa
Author: David Fifield <david at bamsoftware.com>
Date:   Sun May 19 01:02:18 2013 -0700

    Install flashproxy-reg-appspot.
---
 Makefile     |    4 ++--
 doc/Makefile |    4 ++--
 setup.py     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 73b9b5a..79ac5a4 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ MANDIR = $(PREFIX)/share/man
 PYTHON = python
 export PY2EXE_TMPDIR = py2exe-tmp
 
-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 doc/flashproxy-reg-url.1
+CLIENT_BIN = flashproxy-client flashproxy-reg-appspot flashproxy-reg-email flashproxy-reg-http flashproxy-reg-url
+CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-appspot.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 doc/flashproxy-reg-url.1
 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc
 CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.PYTHON
 
diff --git a/doc/Makefile b/doc/Makefile
index e0ae409..516130d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -92,7 +92,7 @@ $(PT_BUNDLE_MACOSX_I686):
 	mkdir -p "$(WORKDIR)"
 	unzip "$(BUNDLE_MACOSX_I686)" -d "$(WORKDIR)"
 
-	cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS
+	cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS
 	cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS
 	mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy
 	cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy
@@ -118,7 +118,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64):
 	mkdir -p "$(WORKDIR)"
 	tar zxf "$(BUNDLE_GNULINUX)" -C "$(WORKDIR)"
 
-	cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App
+	cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App
 	cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App
 	mkdir -p "$(TBBDIR)"/Docs/FlashProxy
 	cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy
diff --git a/setup.py b/setup.py
index 29da95f..89ef178 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ build_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "build")
 dist_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "dist")
 
 setup(
-    console=["flashproxy-client", "flashproxy-reg-email", "flashproxy-reg-http", "flashproxy-reg-url"],
+    console=["flashproxy-client", "flashproxy-reg-appspot", "flashproxy-reg-email", "flashproxy-reg-http", "flashproxy-reg-url"],
     zipfile="py2exe-flashproxy.zip",
     options={
         "build": { "build_base": build_path },