Bug 1311005 - Port Bug 1223385 - use in-tree compare-locales in Makefiles. r=philipp DONTBUILD
authoraleth <aleth@instantbird.org>
Tue, 18 Oct 2016 15:14:38 +0200
changeset 20571 b165ad0f6019cf5ee7320c8909e99fcb4ffd06a0
parent 20570 09ece7c086487cd738adb91669a43ad106a11443
child 20572 6d80e3a2d552dd5a603cc9f5fbc5321085d93cd3
push id12426
push useraleth@instantbird.org
push dateTue, 18 Oct 2016 17:30:39 +0000
treeherdercomm-central@b165ad0f6019 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs1311005, 1223385
Bug 1311005 - Port Bug 1223385 - use in-tree compare-locales in Makefiles. r=philipp DONTBUILD
mail/locales/Makefile.in
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -183,17 +183,17 @@ ifeq (WINNT, $(OS_ARCH))
 	   "$(UPLOAD_DIR)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 endif
 # Set the permissions that the folders will have in ftp once uploaded
 	chmod -vR 775 $(UPLOAD_DIR)
 
 merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
-	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
+	$(MOZILLA_SRCDIR)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) --l10n-ini $(srcdir)/l10n.ini $*
 endif
 	@echo
 
 # test target, depends on make package
 # try to repack x-test, with just toolkit/defines.inc being there
 l10n-check::
 	$(RM) -rf x-test
 	$(NSINSTALL) -D x-test/toolkit