bug 343667 - backing out removal of a couple of bitmaps to fix bustage.

calendar/installer/windows/Makefile.in

@@ -49,6 +49,7 @@ SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/sunbird/7zSD.sfx
 
 PP_LOCALIZED_FILES = \
 	packages-static \
+	installer.cfg \
 	$(NULL)
 
 INSTALLER_FILES = \
@@ -100,6 +101,8 @@ include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
 export::
 ifndef MOZ_USE_OFFICIAL_BRANDING
 	$(NSINSTALL) -D $(DIST)/branding
+	cp $(srcdir)/Header.bmp    $(DIST)/branding/Header.bmp
+	cp $(srcdir)/Watermrk.bmp  $(DIST)/branding/Watermrk.bmp
 	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp

other-licenses/branding/sunbird/Makefile.in

@@ -43,6 +43,8 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 endif
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/sunbird.ico  $(DIST)/branding/app.ico
+	cp $(srcdir)/Header.bmp   $(DIST)/branding/Header.bmp
+	cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
 	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/Watermark.bmp
@@ -50,4 +52,6 @@ endif
 ifeq ($(OS_ARCH),OS2)
 	cp $(srcdir)/sunbird-os2.ico  $(DIST)/branding/sunbird.ico
 	cp $(srcdir)/sunbird-os2.ico  $(DIST)/branding/app.ico
+	cp $(srcdir)/Header.bmp   $(DIST)/branding/Header.bmp
+	cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
 endif