[tor-commits] [torbrowser/maint-2.2] Revert "Linux: Update the Firefox package sequence to a sane variant."

[erinn@xxxxxxxxxxxxxx]

commit 44f116bda052295d26250101f861b08ef4e75edf
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Wed Jun 6 19:44:29 2012 -0300

    Revert "Linux: Update the Firefox package sequence to a sane variant."
    
    This reverts commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef.
---
 build-scripts/linux.mk |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index c06e763..3ebb024 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -85,12 +85,15 @@ build-pidgin:
 build-firefox: config/dot_mozconfig $(FIREFOX_DIR)
 	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cp branding/* $(FIREFOX_DIR)/browser/branding/official
-	cd $(FIREFOX_DIR) && make -f client.mk build package INNER_MAKE_PACKAGE=true
+	cd $(FIREFOX_DIR) && make -f client.mk build
 	touch $(STAMP_DIR)/build-firefox
 
 copy-firefox:
 	-rm -rf $(BUILD_DIR)/Firefox
-	cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox
+	## This is so ugly. Update it to use cool tar --transform soon.
+	cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package
+	cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR)
+	cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox
 
 build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox
 	echo "If we're here, we've done something right."

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