[tor-commits] [torbrowser/maint-2.2] give windows makefile the ability to use both normal wget and the python wget steven made

[erinn@xxxxxxxxxxxxxx]

commit ff24c49c8444afcb0d8606c7997daa8cfef56fb5
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Fri Sep 30 03:04:12 2011 +0100

    give windows makefile the ability to use both normal wget and the python wget steven made
---
 build-scripts/windows.mk |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index d62aeff..9d721db 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -50,7 +50,8 @@ PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER)
 PWD:=$(shell pwd)
 PYTHON=/c/Python26/python.exe
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-WGET=$(PYTHON) $(PWD)/pyget.py
+PYGET=$(PYTHON) $(PWD)/pyget.py
+WGET=wget
 VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py
 WINRAR="/c/Program Files/WinRAR/WinRAR.exe"
 CC=gcc
@@ -346,7 +347,7 @@ launcher:
 
 ## Torbutton development version
 torbutton.xpi:
-	$(WGET) -O $@ $(TORBUTTON)
+	$(PYGET) -O $@ $(TORBUTTON)
 
 ## English comes as default
 langpack_en-US.xpi:
@@ -354,19 +355,19 @@ langpack_en-US.xpi:
 
 ## BetterPrivacy
 betterprivacy.xpi:
-	$(WGET) -O $@ $(BETTERPRIVACY)
+	$(PYGET) -O $@ $(BETTERPRIVACY)
 
 ## NoScript development version
 noscript.xpi: 
-	$(WGET) -O $@ $(NOSCRIPT)
+	$(PYGET) -O $@ $(NOSCRIPT)
 
 ## HTTPS Everywhere
 httpseverywhere.xpi:
-	$(WGET) -O $@ $(HTTPSEVERYWHERE)
+	$(PYGET) -O $@ $(HTTPSEVERYWHERE)
 
 ## Generic language pack rule
 langpack_%.xpi:
-	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
+	$(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
 
 ##
 ## Customize the bundle



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits