Bug 575751 - Add merge locale support [r=mfinkle]
authorMichael Wu <mwu@mozilla.com>
Mon, 22 Nov 2010 22:40:26 -0800
changeset 67060 1ad7333221f25d3a3c0adce489e942e3d9c6d689
parent 67059 17c70e0e1e2a3b022974263ade6a288a9a88787b
child 67061 2f40aecdd38f7c301744cadacb10d017d8918679
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs575751
Bug 575751 - Add merge locale support [r=mfinkle]
mobile/locales/Makefile.in
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -244,8 +244,15 @@ repackage-deb: $(DATASTAGE)
 	$(RM) -rf $(AB_CD)/tmp
 
 deb-%: AB_CD=$*
 deb-%: clobber-% langpack-%
 ifndef DEB_PKG_NAME
 	$(error DEB_PKG_NAME not defined)
 endif
 	@$(MAKE) repackage-deb AB_CD=$(AB_CD) DEB_PKG_NAME=$(DEB_PKG_NAME)
+
+merge-%:
+ifdef LOCALE_MERGEDIR
+	$(RM) -rf $(LOCALE_MERGEDIR)
+	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
+endif
+	@echo