commit 08e9eef89e2c7cf788885d177cc0c710d34bd61e Author: Sebastian Hahn sebastian@torproject.org Date: Wed Feb 1 11:12:24 2012 +0100

Define variables before including versions.mk

Otherwise, the FETCH_DIR variable won't be there when targets and prerequisites are defined --- build-scripts/linux.mk | 6 +++--- build-scripts/osx.mk | 5 +++-- build-scripts/windows.mk | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 742bc65..cc19344 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -31,9 +31,6 @@ ### Configuration ### #####################

-## Include versions -include $(PWD)/versions.mk - ## Architecture ARCH_TYPE=$(shell uname -m) BUILD_NUM=7.2 @@ -49,6 +46,9 @@ FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL

+## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now."

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8fe22a..b00b9fc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,8 +31,6 @@ ### Configuration ### #####################

-## Include versions -include $(PWD)/versions.mk

## Architecture ARCH_TYPE=i386 @@ -60,6 +58,9 @@ FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbosx-dist

+## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now."

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8c00ff5..e27dd37 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -29,8 +29,6 @@ ### Configuration ### #####################

-## Include versions -include $(PWD)/versions.mk BUILD_NUM=7.1 PLATFORM=Windows

@@ -70,6 +68,9 @@ FETCH_DIR=$(PWD)/build-alpha-windows BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist

+## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now."