Bug 509987 No need to create app.ico in dist/branding/app.ico. r=philringnalda
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 12 Aug 2009 14:11:21 -0700
changeset 3290 5816c74846e83e9eb07e81f185373499cb0a0d44
parent 3289 385cfd6cf8dd898307349682cb647307dc77a722
child 3291 2383f23818c276a24271fed9aa512b737b71bc34
push id2675
push userbugzilla@standard8.plus.com
push dateWed, 12 Aug 2009 21:11:46 +0000
treeherdercomm-central@5816c74846e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilringnalda
bugs509987
Bug 509987 No need to create app.ico in dist/branding/app.ico. r=philringnalda
mail/branding/nightly/Makefile.in
other-licenses/branding/thunderbird/Makefile.in
--- a/mail/branding/nightly/Makefile.in
+++ b/mail/branding/nightly/Makefile.in
@@ -51,17 +51,16 @@ DIRS = \
 PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
-	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/app.ico
 	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
 	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
 endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	cp $(srcdir)/background.png    $(DIST)/branding/background.png
 	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
--- a/other-licenses/branding/thunderbird/Makefile.in
+++ b/other-licenses/branding/thunderbird/Makefile.in
@@ -18,17 +18,16 @@ PREF_JS_EXPORTS = $(srcdir)/thunderbird-
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 # Export items into the branding directory first
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
-	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/app.ico
 	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
 	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
 endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	cp $(srcdir)/background.png    $(DIST)/branding/background.png
 	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore