From 29704cf293268cbe5cef3248257ee2bed6fa487a Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Tue, 7 Apr 2009 13:21:57 -0400
Subject: [PATCH] Bug 485935 - Build the default langpack (usually en-US) as
 part of `make package`, r=ted

--HG--
extra : rebase_source : 9c11818058da2a5da0c2c67cd03d8a6be5755d93
---
 browser/installer/Makefile.in | 5 +++++
 browser/locales/Makefile.in   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 9bd55c28196b..81c32ee7c31d 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -110,6 +110,11 @@ endif
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
+libs::
+	$(MAKE) -C $(DEPTH)/browser/locales langpack PKG_LANGPACK_PATH=
+
+UPLOAD_EXTRA_FILES += $(DIST)/$(PKG_LANGPACK_BASENAME).xpi
+
 installer:: removed-files
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 4c04ee689f85..ea68848100ea 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -334,6 +334,8 @@ langpack-%: libs-%
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest -x chrome/$(AB_CD).manifest
 
+langpack: langpack-$(AB_CD)
+
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack an installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.