commit e5c15ee511a79053371530bc22bf0e0492dfee5c Author: Sebastian Hahn sebastian@torproject.org Date: Tue May 22 08:55:34 2012 +0200

Win: Use the make package made firefox

This fixes bug 5922 --- build-scripts/windows.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 16ff624..7431d47 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -111,7 +111,10 @@ copy-firefox: -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp -r $(FIREFOX_DIR)/obj-*/dist/bin/* $(FIREFOX)/App/Firefox + cp $(FIREFOX_DIR)/obj-*/dist/*zip $(FIREFOX)/App/Firefox/ + cd $(FIREFOX)/App/Firefox && unzip $(FIREFOX)/App/Firefox/firefox-*.zip + rm $(FIREFOX)/App/Firefox/firefox-*.zip + mv $(FIREFOX)/App/Firefox/firefox/* $(FIREFOX)/App/Firefox/ && rmdir $(FIREFOX)/App/Firefox/firefox

build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right."