[tor-commits] [torbrowser/maint-2.2] fix torbutton install target so that it gets installed properly

[erinn at torproject.org]

commit 20683a0434db1923e15c2a1b1f37e56e19e986d7
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Jun 6 22:02:14 2012 -0300

    fix torbutton install target so that it gets installed properly
---
 build-scripts/osx.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 06ad594..fd0e797 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -313,7 +313,7 @@ bundle_%:
 compressed-bundle_%:
 	LANGCODE=$* make -f osx.mk compressed-bundle-localized
 bundle-localized_%.stamp:
-	make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final
+	make -f osx.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final
 	touch $(STAMP_DIR)/bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
@@ -353,6 +353,9 @@ ifneq ($(LANGCODE), en-US)
 	cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org.xpi
 endif
 
+install-torbutton: torbutton.xpi
+	cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi
+
 install-httpseverywhere: httpseverywhere.xpi
 	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere at eff.org
 	cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere at eff.org/httpseverywhere.zip