[tor-commits] [torbrowser/maint-2.2] fix path to branding directory

[erinn@xxxxxxxxxxxxxx]

commit ab05ecd6fd420ed9a7efb75eb57163f6892ce530
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Wed Apr 25 13:42:29 2012 -0300

    fix path to branding directory
---
 build-scripts/linux.mk   |    2 +-
 build-scripts/osx.mk     |    2 +-
 build-scripts/windows.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 77b953f..67f7e75 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -89,7 +89,7 @@ build-pidgin:
 
 build-firefox: config/dot_mozconfig $(FIREFOX_DIR)
 	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
-	cp branding/* $(FIREFOX_DIR)/branding
+	cp branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(FIREFOX_DIR) && make -f client.mk build
 	touch $(STAMP_DIR)/build-firefox
 
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 3979f37..59b068c 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -106,7 +106,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
 
 build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
 	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
-	cp branding/* $(FIREFOX_DIR)/branding
+	cp branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(FIREFOX_DIR) && make -f client.mk build
 	touch $(STAMP_DIR)/build-firefox
 
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index a41951a..759628d 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -107,7 +107,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
 
 build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)
 	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
-	cp branding/* $(FIREFOX_DIR)/branding
+	cp branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)"
 	touch $(STAMP_DIR)/build-firefox
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits