commit 7ca852a0789c4851e1f0a538b19aebfd04923556 Author: David Fifield <david@bamsoftware.com> Date: Sun Dec 2 10:35:46 2012 -0800 Override CLIENT_BIN for dist-exe. This removes special cases, so the body of dist-exe is now the same as that of dist, except for DISTNAME and DISTDIR versus DISTNAME_WIN32 and DISTDIR_WIN32. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9a02e3b..4922b33 100644 --- a/Makefile +++ b/Makefile @@ -66,13 +66,13 @@ $(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-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 $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) - cp -f README LICENSE torrc $(DISTDIR_WIN32) + 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)