Bug 491799 mozicon128.png not copied during Thunderbird build. r=mkmelin
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 08 May 2009 10:33:19 +0100
changeset 2585 1abc1fccf61e0f3f084603f6edba117817570b28
parent 2584 e69e1122b17ad4ba155e2a4734ac41d85b2b8281
child 2586 eed393b2e3afbbf4b43da30b2e78c49413faba37
push idunknown
push userunknown
push dateunknown
reviewersmkmelin
bugs491799
Bug 491799 mozicon128.png not copied during Thunderbird build. r=mkmelin
mail/app/Makefile.in
other-licenses/branding/thunderbird/Makefile.in
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -325,19 +325,25 @@ endif
 ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
 ICON_FILES	= \
 		$(DIST)/branding/mozicon50.xpm \
 		$(DIST)/branding/mozicon16.xpm \
 		$(NULL)
 
 libs::
 	$(INSTALL) $(IFLAGS1) $(ICON_FILES) $(DIST)/bin/icons
+	if test -e $(DIST)/branding/mozicon128.png; then \
+	  $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons; \
+	fi;
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
+	if test -e $(DIST)/branding/mozicon128.png; then \
+	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DESTDIR)$(mozappdir)/icons; \
+	fi;
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
 LIBS += -lphexlib
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 
--- a/other-licenses/branding/thunderbird/Makefile.in
+++ b/other-licenses/branding/thunderbird/Makefile.in
@@ -33,16 +33,17 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
 	cp $(srcdir)/background.png    $(DIST)/branding/background.png
 	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
 	cp $(srcdir)/disk.icns         $(DIST)/branding/disk.icns
 	cp $(srcdir)/thunderbird.icns  $(DIST)/branding/thunderbird.icns
 endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 	cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm
 	cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
+	cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png
 	cp $(srcdir)/default.xpm   $(DIST)/branding/default.xpm	
 endif
 ifeq ($(OS_ARCH),OS2)
 	cp $(srcdir)/thunderbird-os2.ico  $(DIST)/branding/thunderbird.ico
 	cp $(srcdir)/thunderbird-os2.ico  $(DIST)/branding/app.ico
 endif
 # Now sort out the branding specific icons
 ifeq ($(OS_ARCH),WINNT)