Bug 532656 Fix Sunbird official branding on Mac. r=philipp

calendar/confvars.sh

@@ -37,7 +37,9 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=sunbird
-MOZ_APP_DISPLAYNAME=Calendar
+# This sets the default for nightly branding, and may get overriden by options
+# in configure.in depending on the arguments passed.
+MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/sunbird/branding/nightly
 MOZ_UPDATER=1
 MOZ_SUNBIRD=1
 MOZ_CALENDAR=1

calendar/sunbird/branding/nightly/configure.sh

@@ -0,0 +1 @@
+MOZ_APP_DISPLAYNAME=Calendar

configure.in

@@ -4923,7 +4923,6 @@ MOZ_ARG_ENABLE_BOOL(official-branding,
 [case "$MOZ_BUILD_APP" in
 calendar)
     MOZ_BRANDING_DIRECTORY=other-licenses/branding/sunbird
-    MOZ_APP_DISPLAYNAME=Sunbird
     ;;
 
 mail)

other-licenses/branding/sunbird/configure.sh

@@ -0,0 +1 @@
+MOZ_APP_DISPLAYNAME=Sunbird