Bug 432840 [mac] Include symbolic link to Applications folder - Provide new backgrund and symbolic link for official branding. Background image by Sean Martell, patch by me. r=bienvenu

mail/installer/Makefile.in

@@ -116,11 +116,8 @@ 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
-# Disabled for release until we have updated images
-ifndef MOZ_BRANDING_DIRECTORY
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
-endif
 
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 

mail/locales/Makefile.in

@@ -49,7 +49,6 @@ _ABS_DIST := $(shell cd $(DIST) && pwd)
 
 ifndef MOZ_BRANDING_DIRECTORY
 MOZ_BRANDING_DIRECTORY = mail/branding/nightly
-GENERATE_DMG_SYMLINK = 1
 endif
 
 SUBMAKEFILES += \
@@ -118,11 +117,8 @@ MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_RSRC=$(_ABS_DIST)/branding/license.r
-# Disabled for official branding until we have updated images
-ifdef GENERATE_DMG_SYMLINK
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
-endif
 
 PACKAGER_NO_LIBS = 1
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk