Part of bug 811770 - Use a different wordmark and possibly other branding changes for Thunderbird 17 ESR - package the esr branding preference file when appropraite. r=jhopkins,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 30 Jan 2013 08:42:08 +0000
changeset 13606 56b85911cf0bc53330e24e170b63466666996a24
parent 13600 8879400cea281133e3c172c0dfd05d517a983877
child 13607 830f2f1e3a3664956d6a3dce505962d78b40212b
push id28
push userbugzilla@standard8.plus.com
push dateWed, 30 Jan 2013 08:42:28 +0000
reviewersjhopkins, Standard8
bugs811770
Part of bug 811770 - Use a different wordmark and possibly other branding changes for Thunderbird 17 ESR - package the esr branding preference file when appropraite. r=jhopkins,a=Standard8
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -44,16 +44,20 @@ DEFINES += -DJAREXT=
 endif
 
 ifdef MOZ_ANGLE
 DEFINES += -DMOZ_ANGLE=$(MOZ_ANGLE)
 DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 
+ifdef MOZ_ESR
+DEFINES += -DMOZ_ESR=1
+endif
+
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 ifdef MOZ_PKG_MANIFEST_P
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -303,17 +303,21 @@
 
 ; default pref files
 @BINPATH@/defaults/pref/all-thunderbird.js
 @BINPATH@/defaults/pref/channel-prefs.js
 @BINPATH@/defaults/pref/composer.js
 @BINPATH@/defaults/pref/mailnews.js
 @BINPATH@/defaults/pref/mdn.js
 @BINPATH@/defaults/pref/smime.js
+#ifdef MOZ_ESR
+@BINPATH@/defaults/pref/thunderbird-esr-branding.js
+#else
 @BINPATH@/defaults/pref/thunderbird-branding.js
+#endif
 @BINPATH@/greprefs.js
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; App extensions to Mail
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; LDAP components
 @BINPATH@/components/mozldap.xpt