[tor-commits] [torbrowser/maint-2.3] make alpha bundles use stable firefox patches too

[erinn at torproject.org]

commit b3ad6d4cd55665a5008f7abdde5a8e9b1ec628e7
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Oct 16 11:24:24 2012 +0100

    make alpha bundles use stable firefox patches too
---
 build-scripts/versions-alpha.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index a6d94a6..2aa6cd8 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -196,11 +196,11 @@ $(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR)
 	rm -rf $(TOR_DIR)
 	cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/
 
-$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/alpha/* | $(BUILD_DIR)
+$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* | $(BUILD_DIR)
 	rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release
 	cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/
 	mv $(BUILD_DIR)/mozilla-release $(FIREFOX_DIR)
-	cp ../src/current-patches/firefox/alpha/* $(FIREFOX_DIR)
+	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
 	cp patch-any-src.sh $(FIREFOX_DIR)
 	cd $(FIREFOX_DIR) && ./patch-any-src.sh