bug 349032 - Include branding with Mac dmg. r1=ctalbert,r2=jminta

calendar/installer/Makefile.in

@@ -92,13 +92,12 @@ $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
-# XXX Enable when using generic branding
-# ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-# MOZ_PKG_MAC_DSSTORE=branding/dsstore
-# MOZ_PKG_MAC_BACKGROUND=branding/background.png
-# MOZ_PKG_MAC_ICON=branding/disk.icns
-# MOZ_PKG_MAC_RSRC=branding/license.r
-# endif
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+MOZ_PKG_MAC_DSSTORE=branding/dsstore
+MOZ_PKG_MAC_BACKGROUND=branding/background.png
+MOZ_PKG_MAC_ICON=branding/disk.icns
+MOZ_PKG_MAC_RSRC=branding/license.r
+endif
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 

calendar/sunbird/app/Makefile.in

@@ -305,6 +305,10 @@ ifeq ($(OS_ARCH),WINNT)
 endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	cp $(srcdir)/macbuild/sunbird.icns  $(DIST)/branding/sunbird.icns
+	cp $(srcdir)/macbuild/dsstore  $(DIST)/branding/dsstore
+	cp $(srcdir)/macbuild/background.png  $(DIST)/branding/background.png
+	cp $(srcdir)/macbuild/disk.icns  $(DIST)/branding/disk.icns
+	cp $(srcdir)/macbuild/license.r  $(DIST)/branding/license.r
 endif
 ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
 	cp $(srcdir)/mozicon128.png  $(DIST)/branding/mozicon128.png