[or-cvs] r13303: Make location of wget binary and configurable parameter (in torbrowser/trunk: . build-scripts)

[sjm217 at seul.org]

Author: sjm217
Date: 2008-01-26 18:00:21 -0500 (Sat, 26 Jan 2008)
New Revision: 13303

Modified:
   torbrowser/trunk/README
   torbrowser/trunk/build-scripts/Makefile
Log:
Make location of wget binary and configurable parameter

Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2008-01-26 22:49:36 UTC (rev 13302)
+++ torbrowser/trunk/README	2008-01-26 23:00:21 UTC (rev 13303)
@@ -89,3 +89,4 @@
         - Empty add-on installation whitelist
 0.0.6: Released 2008-01-xx
        Rename start file "Start Tor Browser" so as to be easier to explain
+       Location of wget is now a configurable parameter

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-01-26 22:49:36 UTC (rev 13302)
+++ torbrowser/trunk/build-scripts/Makefile	2008-01-26 23:00:21 UTC (rev 13303)
@@ -12,6 +12,7 @@
 VIDALIA=/c/build/vidalia
 TOR=/c/build/tor-0.2.0.12-alpha
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
+WGET=wget
 
 FIREFOX_SRC="FirefoxPortable"
 CONFIG_SRC=config
@@ -49,7 +50,7 @@
 
 TORBUTTON=torbutton-1.1.12-alpha.xpi
 $(TORBUTTON):
-	wget http://torbutton.torproject.org/dev/releases/$(TORBUTTON)
+	$(WGET) http://torbutton.torproject.org/dev/releases/$(TORBUTTON)
 
 bundle: package-files install-torbutton patch-language launcher
 
@@ -104,14 +105,14 @@
 
 ## Download language packs
 langpack_fa.xpi:
-	wget -O $@ https://addons.mozilla.org/en-US/firefox/downloads/file/18157/persian_language_pack-2.0.0.6-fx.xpi
+	$(WGET) -O $@ https://addons.mozilla.org/en-US/firefox/downloads/file/18157/persian_language_pack-2.0.0.6-fx.xpi
 
 langpack_zh-cn.xpi:
-	wget -O $@ http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.11/win32/xpi/zh-CN.xpi
+	$(WGET) -O $@ http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.11/win32/xpi/zh-CN.xpi
 
 ## Download Quick Locale Switcher
 quick_locale_switcher.xpi:
-	wget -O $@ https://addons.mozilla.org/en-US/firefox/downloads/file/20672/quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi
+	$(WGET) -O $@ https://addons.mozilla.org/en-US/firefox/downloads/file/20672/quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi
 
 ## Set the language for Vidalia and Firefox
 ## Currently supported: en: English; fa: Farsi; zh-cn: Chinese simplified