commit 2474a46bae381d165477732226a9c5762fa5e6fc Author: Erinn Clark <erinn@torproject.org> Date: Fri Feb 3 00:49:43 2012 +0100 fix some path names since this is the stable branch --- build-scripts/osx.mk | 10 +++++----- build-scripts/versions.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 8f31ec8..a06200d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -20,7 +20,7 @@ ### make -f osx.mk build-all-binaries ### make -f osx.mk all-compressed-bundles ### ... -### Look in tbbosx-alpha-dist/ for your files. +### Look in tbbosx-dist/ for your files. ### ### See LICENSE for licensing information ### @@ -36,14 +36,14 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=4 +BUILD_NUM=5 PLATFORM=MacOS ## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) +FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built -TBB_FINAL=$(BUILT_DIR)/tbbosx-alpha-dist +TBB_FINAL=$(BUILT_DIR)/tbbosx-dist source-dance: fetch-source unpack-source echo "We're ready for building now." @@ -154,7 +154,7 @@ DEST=generic-bundle NAME=TorBrowser ## Where shall we put the finished files for distribution? -DISTDIR=tbbosx-alpha-dist +DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1ee01eb..5eac8db 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -106,7 +106,7 @@ unpack-libevent: cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) unpack-tor: - -rm -rf $(FETCH_DIR)/tor-$(TOR-VER) + -rm -rf $(FETCH_DIR)/tor-$(TOR_VER) cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) unpack-firefox: