[tor-commits] [torbrowser/master] add noscript back, and fix a directory path

[erinn at torproject.org]

commit b4cbec6fe86bcfbdf0f7fdb4ef5bda8fa29c5cf7
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Apr 13 03:15:12 2011 +0000

    add noscript back, and fix a directory path
---
 build-scripts/linux.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 149fb7d..a9fab0f 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -38,7 +38,7 @@ include $(PWD)/versions.mk
 ARCH_TYPE=$(shell uname -m)
 
 ## Location of directory for source unpacking
-FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE)
+FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE)
 ## Location of directory for prefix/destdir/compiles/etc
 BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
@@ -167,7 +167,7 @@ COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME)
 endif
 
 ## Extensions to install by default
-DEFAULT_EXTENSIONS=torbutton.xpi httpseverywhere.xpi
+DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi
 
 ## Where to download Torbutton from
 TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi