[tor-commits] [flashproxy/master] Have dist-exe delegate to dist.

[dcf at torproject.org]

commit 24d5a7a254fa7f8290d7952aca2d9fe96d3f3429
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Dec 2 10:48:48 2012 -0800

    Have dist-exe delegate to dist.
---
 Makefile |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 4922b33..2eb14ae 100644
--- a/Makefile
+++ b/Makefile
@@ -64,16 +64,10 @@ $(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN)
 	rm -rf logdict*.log
 
 # See doc/windows-deployment-howto.txt.
-DISTNAME_WIN32 = $(DISTNAME)-win32
-DISTDIR_WIN32 = $(DISTDIR)-win32
+dist-exe: DISTNAME := $(DISTNAME)-win32
 dist-exe: CLIENT_BIN := $(PYINSTALLER_TMPDIR)/dist/*
 dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN))
-dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec
-	rm -rf dist
-	mkdir -p $(DISTDIR_WIN32)
-	mkdir $(DISTDIR_WIN32)/doc
-	cp -f $(CLIENT_DIST_FILES) $(DISTDIR_WIN32)
-	cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc
-	cd dist && zip -q -r -9 $(DISTNAME_WIN32).zip $(DISTNAME_WIN32)
+# Delegate to the "dist" target using the substitutions above.
+dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec dist
 
 .PHONY: all install clean test dist sign dist-exe