Bug 1081400 - l10n packager error since new file structure. r=Callek, a=Fixesl10nBuilds
authorNomis101 <Nomis101@web.de>
Sat, 25 Oct 2014 15:18:14 -0400
changeset 16952 9012461955e422dbd87e2f5fd1eec2c508b984f7
parent 16951 dbb0d5f5e0f2e54d459c182b4ae02e00745458b5
child 16953 9be20e940504a68f10da3ffd384a8f619ae7459e
push id10533
push userjosiah@programmer.net
push dateSat, 25 Oct 2014 19:22:35 +0000
treeherdercomm-central@9012461955e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, Fixesl10nBuilds
bugs1081400
Bug 1081400 - l10n packager error since new file structure. r=Callek, a=Fixesl10nBuilds
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -107,16 +107,19 @@ include $(MOZILLA_SRCDIR)/toolkit/mozapp
 ifeq (Darwin, $(OS_ARCH))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 BINPATH = bin
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+AB = $(firstword $(subst -, ,$(AB_CD)))
+DEFINES += -DAB=$(AB)
+
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
 ifdef MOZ_NATIVE_ICU
 DEFINES += -DMOZ_NATIVE_ICU
 endif
 ifdef MOZ_SHARED_ICU
 DEFINES += -DMOZ_SHARED_ICU
 endif
 DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -25,17 +25,17 @@
 #endif
 
 #ifdef XP_MACOSX
 ; Mac bundle stuff
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
 @APPNAME@/Contents/Library/
 @APPNAME@/Contents/Resources/thunderbird.icns
-@APPNAME@/Contents/Resources/en.lproj/*
+@APPNAME@/Contents/Resources/@AB@.lproj/*
 #endif
 
 [@AB_CD@]
 @BINPATH@/chrome/@AB_CD@@JAREXT@
 @BINPATH@/chrome/@AB_CD@.manifest
 @BINPATH@/@PREF_DIR@/all-l10n.js
 @BINPATH@/searchplugins/*
 @BINPATH@/dictionaries/*