Backed out changeset a87a27864bb8 (bug 1223385)

This commit is contained in:
Carsten "Tomcat" Book 2016-01-15 13:51:54 +01:00
parent 9ccdb639ec
commit b9de9c50fc
3 changed files with 3 additions and 3 deletions

View File

@ -189,7 +189,7 @@ ident:
merge-%:
ifdef LOCALE_MERGEDIR
$(RM) -rf $(LOCALE_MERGEDIR)
$(topsrcdir)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) $*
MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
endif
@echo

View File

@ -82,6 +82,6 @@ ident:
merge-%:
ifdef LOCALE_MERGEDIR
$(RM) -rf $(LOCALE_MERGEDIR)
$(topsrcdir)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) $*
MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
endif
@echo

View File

@ -70,7 +70,7 @@ class CompareLocales(MachCommandBase):
merge_dir = mozpath.join(
self.topobjdir,
self.substs['MOZ_BUILD_APP'],
'locales', 'merge-dir-{ab_CD}'
'locales', 'merge-{ab_CD}'
)
except Exception:
pass