[tor-commits] [torbrowser/maint-2.3] update firefox build targets to accommodate renaming of patching script

[erinn at torproject.org]

commit c3c37f7450471fbbf945c084c1b141617b81f5fb
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Oct 29 15:22:22 2011 +0100

    update firefox build targets to accommodate renaming of patching script
---
 build-scripts/linux.mk   |    6 +++---
 build-scripts/osx.mk     |    6 +++---
 build-scripts/windows.mk |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 73d0298..f6394c3 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -112,10 +112,10 @@ build-pidgin:
 
 FIREFOX_DIR=$(FETCH_DIR)/mozilla-release
 build-firefox:
-	cp ../src/current-patches/000* $(FIREFOX_DIR)
-	cp patch-firefox-src.sh $(FIREFOX_DIR)
+	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
+	cp patch-any-src.sh $(FIREFOX_DIR)
 	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
-	cd $(FIREFOX_DIR) && ./patch-firefox-src.sh
+	cd $(FIREFOX_DIR) && ./patch-any-src.sh
 	cd $(FIREFOX_DIR) && make -f client.mk build
 
 copy-firefox:
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index a8a1841..817f32a 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -107,10 +107,10 @@ build-tor:
 
 FIREFOX_DIR=$(FETCH_DIR)/mozilla-release
 build-firefox:
-	cp ../src/current-patches/000* $(FIREFOX_DIR)
-	cp patch-firefox-src.sh $(FIREFOX_DIR)
+	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
+	cp patch-any-src.sh $(FIREFOX_DIR)
 	cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
-	cd $(FIREFOX_DIR) && ./patch-firefox-src.sh
+	cd $(FIREFOX_DIR) && ./patch-any-src.sh
 	cd $(FIREFOX_DIR) && make -f client.mk build
 
 copy-firefox:
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 13d608d..3e44b13 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -110,7 +110,7 @@ build-tor:
 
 FIREFOX_DIR=/c/mozilla-build/mozilla-release
 build-firefox:
-	cp ../src/current-patches/000* $(FIREFOX_DIR)
+	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
 	cp patch-firefox-src.sh $(FIREFOX_DIR)
 	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cd $(FIREFOX_DIR) && ./patch-firefox-src.sh