Bug #241003 --> port official branding for thunderbird to the trunk

Makefile.in

@@ -199,6 +199,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 tier_9_dirs	+= xpfe/bootstrap/appleevents
 endif
 
+ifdef THUNDERBIRD
+ifdef MOZ_USE_OFFICIAL_BRANDING
+tier_9_dirs  += other-licenses/branding/thunderbird
+endif
+endif
+
 ifdef MOZ_PHOENIX
 ifdef MOZ_USE_OFFICIAL_BRANDING
 tier_9_dirs  += other-licenses/branding/firefox

allmakefiles.sh

@@ -846,10 +846,15 @@ extensions/typeaheadfind/Makefile
 "
 
 if [ "$MOZ_USE_OFFICIAL_BRANDING" ]; then
-    MAKEFILES_firefox_branding="
-        other-licenses/branding/firefox/Makefile
-        other-licenses/branding/firefox/content/Makefile
-    "
+    if [ "$MOZ_PHOENIX" ]; then
+    	MAKEFILES_firefox_branding="
+        	other-licenses/branding/firefox/Makefile
+	        other-licenses/branding/firefox/content/Makefile
+		"
+    fi
+    if [ "$MOZ_THUNDERBIRD" ]; then
+    	MAKEFILES_thunderbird_branding="other-licenses/branding/thunderbird/Makefile"
+    fi
 fi
 
 MAKEFILES_phoenix="
@@ -1451,6 +1456,9 @@ if test -n "$MOZ_XUL_APP"; then
 fi
 
 if test -n "$MOZ_THUNDERBIRD"; then
+    if test -n "$MOZ_USE_OFFICIAL_BRANDING"; then
+        add_makefiles "$MAKEFILES_thunderbird_branding"
+    fi
     add_makefiles "$MAKEFILES_thunderbird"
 fi
 

client.mk

@@ -405,7 +405,9 @@ ifdef MAIL_CO_TAG
   MAIL_CO_FLAGS := $(MAIL_CO_FLAGS) -r $(MAIL_CO_TAG)
 endif
 
-CVSCO_THUNDERBIRD := $(CVS) $(CVS_FLAGS) co $(MAIL_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/mail
+MAIL_CO_DIRS := mozilla/mail mozilla/other-licenses/branding/thunderbird
+
+CVSCO_THUNDERBIRD := $(CVS) $(CVS_FLAGS) co $(MAIL_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(MAIL_CO_DIRS)
 ifdef MOZ_THUNDERBIRD
 FASTUPDATE_THUNDERBIRD := fast_update $(CVSCO_THUNDERBIRD)
 CHECKOUT_THUNDERBIRD := cvs_co $(CVSCO_THUNDERBIRD)