Bug 1413581: Use comm-central friendly path for calling gen_multilocale.py. r=chmanchester

MozReview-Commit-ID: CVUOrkkekNf

--HG--
extra : rebase_source : f7f048110551e2ee2c7752ed458ba85b80ba41b9
This commit is contained in:
Tom Prince 2017-11-01 10:40:53 -06:00
parent a86d96e077
commit ad6d3406a9

View File

@ -200,14 +200,14 @@ endif
# and places it in dist/bin/res - it should be used when packaging a build.
multilocale.json: LOCALES?=$(MOZ_CHROME_MULTILOCALE)
multilocale.json:
$(call py_action,file_generate,$(topsrcdir)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
# This version of the target uses AB_CD to build multilocale.json and places it
# in the $(XPI_NAME)/res dir - it should be used when repackaging a build.
multilocale.json-%: LOCALES?=$(AB_CD)
multilocale.json-%: MULTILOCALE_DIR=$(DIST)/xpi-stage/$(XPI_NAME)/res
multilocale.json-%:
$(call py_action,file_generate,$(topsrcdir)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
locale-manifest.in: LOCALES?=$(MOZ_CHROME_MULTILOCALE)
locale-manifest.in: $(GLOBAL_DEPS) FORCE