Commit c078c2fc authored by David Fifield's avatar David Fifield
Browse files

Include the "-win32" suffix when overriding windows DISTNAME. 

ac52cd37 caused Makefile to look in directories with a "-win32" suffix;
we need to tell the flashproxy Makefile to use the same suffix.

This is the error I was getting:

cp -Rn "work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32"/{*.pyd,*.dll,*.exe,*.zip} "work/windows-2.4.17-rc-1-pt1/Tor Browser"/App
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.pyd': No such file or directory
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.dll': No such file or directory
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.exe': No such file or directory
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.zip': No such file or directory
Makefile:89: recipe for target `tor-pluggable-transports-browser-2.4.17-rc-1-pt1_en-US.exe' failed

work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client existed,
but not the same directory with a "-win32" suffix.
parent 91f853b0

Makefile

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ FLASHPROXY_HOME = $(SRCDIR)/../flashproxy 
FLASHPROXY_WORK = $(workdir)/flashproxy

FLASHPROXY_DISTNAME = flashproxy-client

FLASHPROXY_DIST = $(FLASHPROXY_WORK)/dist/$(FLASHPROXY_DISTNAME)

FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_DIST)-win32

FLASHPROXY_DISTNAME_WIN32 = flashproxy-client-win32

FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_WORK)/dist/$(FLASHPROXY_DISTNAME)



PYTHON = python

PYTHON_W32 = $(PYTHON)
@@ -109,7 +110,7 @@ $(PT_BUNDLE_WINDOWS): 
	git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)"

	cd "$(FLASHPROXY_WORK)" && git checkout --detach "$(FLASHPROXY_TAG)"

	cd "$(FLASHPROXY_WORK)" && "$(MAKE)" PYTHON="$(PYTHON)" PYTHON_W32="$(PYTHON_W32)" \

	  DISTNAME="$(FLASHPROXY_DISTNAME)" clean dist-exe

	  DISTNAME="$(FLASHPROXY_DISTNAME_WIN32)" clean dist-exe

	cp -Rn "$(FLASHPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(tbbdir)"/App

	mkdir -p "$(tbbdir)"/Docs/FlashProxy

	cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(tbbdir)"/Docs/FlashProxy