Fix bustage from
bug 723138 caused by
bug 723135 not having landed yet. r=Callek over irc,a=Standard8
--- a/calendar/locales/Makefile.in
+++ b/calendar/locales/Makefile.in
@@ -77,16 +77,17 @@ WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG
ifdef MOZ_SUNBIRD
RETRIEVE_WINDOWS_INSTALLER = 1
endif
DEFINES += \
-DAB_CD=$(AB_CD) \
-DMOZ_LANGPACK_EID=langpack-$(AB_CD)@sunbird.mozilla.org \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+ -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION) \
-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
-DPKG_BASENAME="$(PKG_BASENAME)" \
-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
$(NULL)
include $(topsrcdir)/config/rules.mk
clobber-%:
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -39,16 +39,18 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mail/locales
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
+DEFINES += -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION)
+
vpath %.xml @srcdir@/en-US/searchplugins
vpath %.xml $(LOCALE_SRCDIR)/searchplugins
_ABS_SRCDIR := $(call core_abspath,$(topsrcdir))
SUBMAKEFILES += \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -39,16 +39,18 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = suite/locales
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
+DEFINES += -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION)
+
_ABS_SRCDIR := $(call core_abspath,$(topsrcdir))
vpath %.xml @srcdir@/en-US/searchplugins
vpath %.xml $(LOCALE_SRCDIR)/searchplugins
SUBMAKEFILES += \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
$(NULL)