commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef
Author: Shondoit Walker <[email protected]>
Date: Sat Jun 2 11:53:27 2012 +0200
Linux: Update the Firefox package sequence to a sane variant.
---
build-scripts/linux.mk | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index ef72f13..81b0888 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -85,15 +85,12 @@ 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
+ cd $(FIREFOX_DIR) && make -f client.mk build package
INNER_MAKE_PACKAGE=true
touch $(STAMP_DIR)/build-firefox
copy-firefox:
-rm -rf $(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
+ cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/*
$(BUILD_DIR)/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
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
