[tor-commits] [torbrowser/maint-2.4] OSX: use make package to get Firefox's omni.ja

[erinn at torproject.org]

commit 22c493a03ebc440dc6c16c08455053c322afd16b
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Feb 5 14:51:39 2013 +0100

    OSX: use make package to get Firefox's omni.ja
---
 build-scripts/osx-alpha.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 8e339f7..95dc973 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -129,11 +129,12 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
 	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
 	cp branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(FIREFOX_DIR) && make -f client.mk build
+	cd $(FIREFOX_DIR) && make -C obj* package
 	touch $(STAMP_DIR)/build-firefox
 
 copy-firefox:
 	-rm -rf $(BUILD_DIR)/TorBrowser.app
-	cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app
+	cp -r $(FIREFOX_DIR)/obj*/dist/firefox/*.app $(BUILD_DIR)/TorBrowser.app
 
 build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy
 	echo "If we're here, we've done something right."