[tor-commits] [torbrowser/maint-2.2] update windows and osx makefiles to fix version population and building

[erinn at torproject.org]

commit 84e1f32a0dace1ef960fc1b328b4bcad61dbc41f
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Mar 23 13:41:21 2011 +0100

    update windows and osx makefiles to fix version population and building
---
 build-scripts/Makefile |    4 ++--
 build-scripts/osx.mk   |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-scripts/Makefile b/build-scripts/Makefile
index 419ca1d..b505df3 100644
--- a/build-scripts/Makefile
+++ b/build-scripts/Makefile
@@ -25,8 +25,8 @@ PIDGIN_VERSION=2.7.5
 VIDALIA=/e/build/vidalia-0.2.10
 TOR=/e/build/tor-0.2.1.30
 POLIPO=/e/build/polipo-1.0.4.1
-FIREFOX_SRC=/e/build/FirefoxPortable-3.6.16
-PIDGIN_SRC=/e/build/PidginPortable-2.7.5
+FIREFOX_SRC=/e/build/FirefoxPortable-$(FIREFOX_VERSION)
+PIDGIN_SRC=/e/build/PidginPortable-$(PIDGIN_VERSION)
 
 ## Location of utility applications
 PWD:=$(shell pwd)
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 3dcb011..a155d7d 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -144,8 +144,8 @@ build-libevent:
 	cd $(LIBEVENT_DIR) && make install
 
 TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER)
-TOR_CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386"
-TOR_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+TOR_CFLAGS="-I$(BUILT_DIR)/lib -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386"
+TOR_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
 TOR_OPTS=--enable-static-openssl --enable-static-zlib --enable-static-libevent --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0"
 build-tor:
 	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)
@@ -229,7 +229,7 @@ NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_V
 BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
 HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
 ## Where to download Mozilla language packs
-MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest/mac/xpi
+MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/mac/xpi
 
 ## Put more extensions here
 EXTENSIONS_DIR=extensions