[tor-commits] [torbrowser/master] OSX: Use self-built Qt to build Vidalia

[erinn at torproject.org]

commit 117bdd82fdd75f00d0875ff4770437352423fe84
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri Feb 3 16:08:18 2012 +0100

    OSX: Use self-built Qt to build Vidalia
---
 build-scripts/osx.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 82e0a1b..44157c5 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -98,7 +98,7 @@ build-qt: build-zlib build-openssl $(QT_DIR)
 	cd $(QT_DIR) && make install
 	touch build-qt
 
-VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
+VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \
 	-DCMAKE_BUILD_TYPE=debug ..
 build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
 	export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION)