[tor-commits] [torbrowser/master] Move the tor prefix declaration into version.mk

[erinn at torproject.org]

commit 411aa8543d050d7c3b56e044d2965319ded0d905
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed May 2 04:55:24 2012 +0200

    Move the tor prefix declaration into version.mk
---
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    2 +-
 build-scripts/windows.mk  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 86adbc5..f8e87ea 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 	cd $(LIBEVENT_DIR) && make install
 	touch $(STAMP_DIR)/build-libevent
 
-TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
+TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib
 
 build-pidgin:
 	echo "We're not building pidgin yet!"
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 259039b..4a01376 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 
 TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)"
 TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)"
-TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC)
+TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC)
 
 build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
 	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index d837576..91e3aa7 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -229,7 +229,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR)
 
 # Common build functionality. Modified by variables set in OS-specific makefiles
 build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
-	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory
+	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR)
 	cd $(TOR_DIR) && make -j $(NUM_CORES)
 	cd $(TOR_DIR) && make install
 	touch $(STAMP_DIR)/build-tor
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 855e211..c126d90 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 
 TOR_CFLAGS="-I$(BUILT_DIR)/include"
 TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin"
-TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
+TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib
 build-tor:PATH+=:$(BUILT_DIR)/bin 
 
 build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)