Official thunderbird branding cleanup. Add packaging code for offical branding content instead of copying the artwork into the mozilla\mail directory.

Makefile.in

@@ -352,6 +352,9 @@ endif
 
 ifdef MOZ_THUNDERBIRD
 tier_99_dirs	+= mail xpfe/bootstrap/init.d
+ifdef MOZ_USE_OFFICIAL_BRANDING
+tier_99_dirs  += other-licenses/branding/thunderbird/content
+endif
 endif
 
 ifdef MOZ_STANDALONE_COMPOSER

allmakefiles.sh

@@ -869,6 +869,7 @@ other-licenses/branding/firefox/content/Makefile
 
 MAKEFILES_thunderbird_branding="
 other-licenses/branding/thunderbird/Makefile
+other-licenses/branding/thunderbird/content/Makefile
 "
 
 MAKEFILES_phoenix="

other-licenses/branding/thunderbird/Makefile.in

@@ -19,22 +19,9 @@ MAIL_APP_FILES = \
 	mozicon50.xpm \
 	$(NULL)
 
-MAIL_CONTENT_FILES = \
-	about-credits.png \
-	about-thunderbird.png \
-	$(NULL)
-
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 	cp $(addprefix $(srcdir)/, $(MAIL_APP_FILES)) $(DIST)/branding/
-	if [ ! -d $(DEPTH)/mail/base/content ] ; then \
-		mkdir $(DEPTH)/mail/base/content; \
-	fi
-	cp $(addprefix $(srcdir)/, $(MAIL_CONTENT_FILES)) $(DEPTH)/mail/base/content
-	if [ ! -d $(DEPTH)/mail/base/locale ] ; then \
-		mkdir $(DEPTH)/mail/base/locale; \
-	fi
-	cp $(addprefix $(srcdir)/, thunderbird-watermark.png) $(DEPTH)/mail/base/locale
 	if [ ! -d $(DEPTH)/mail/app/icons ] ; then \
 		mkdir $(DEPTH)/mail/app/icons; \
 	fi

other-licenses/branding/thunderbird/content/Makefile.in

@@ -0,0 +1,12 @@
+# Branding Makefile
+#  - jars chrome artwork
+
+DEPTH = ../../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+

other-licenses/branding/thunderbird/content/jar.mn

@@ -0,0 +1,7 @@
+messenger.jar:
++ content/messenger/about-credits.png             (about-credits.png)
++ content/messenger/about-thunderbird.png         (about-thunderbird.png)
++ content/messenger/thunderbird-wizard-badge.png  (thunderbird-wizard-badge.png)
+  
+en-US.jar:
++ locale/en-US/messenger/thunderbird-watermark.png (thunderbird-watermark.png)