Bug 1424171: Control locale dirs.
MozReview-Commit-ID: GPbnhyy0EUW
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -58,16 +58,19 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUND
-DSEAMONKEY_MAXVERSION=$(SEAMONKEY_MAXVERSION) \
-DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
-DXPI_EM_ID="$(XPI_EM_ID)" \
$(NULL)
MOZ_BUILDID = $(shell $(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID)
+LOCALE_TOPDIR=$(commtopsrcdir)
+LOCALE_RELATIVEDIR=calendar/lightning
+
include $(moztopsrcdir)/config/rules.mk
include $(srcdir)/versions.mk
include $(srcdir)/lightning-packager.mk
include $(srcdir)/lightning-tests.mk
# For Lightning, we also need to preprocess the l10n prefs. Pull in the en-US
# copy if the files doesn't exist.
repack-process-extrafiles: lightning-extrafiles
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -37,16 +37,19 @@ BRANDING_FILES = \
$(NULL)
DEFINES += \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME='${MOZ_APP_DISPLAYNAME}' \
-DMOZILLA_VERSION=${MOZILLA_VERSION} \
$(NULL)
+LOCALE_TOPDIR=$(commtopsrcdir)
+LOCALE_RELATIVEDIR=mail/installer/windows
+
include $(moztopsrcdir)/config/config.mk
ifdef LOCALE_MERGEDIR
PPL_LOCALE_ARGS = \
--l10n-dir=$(LOCALE_MERGEDIR)/mail/installer \
--l10n-dir=$(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer \
--l10n-dir=$(commtopsrcdir)/mail/locales/en-US/installer \
$(NULL)
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -1,12 +1,15 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+LOCALE_TOPDIR=$(commtopsrcdir)
+LOCALE_RELATIVEDIR=mail/locales
+
include $(moztopsrcdir)/config/config.mk
SUBMAKEFILES += \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
$(NULL)
# This makefile uses variable overrides from the libs-% target to