Bug 532656 Fix Sunbird official branding on Mac. r=philipp
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 03 Dec 2009 16:56:14 +0000
changeset 4488 d61c957030ee5d7c7819e3c76226380f602b8fb2
parent 4487 0d4209c64aeb23d99fc630b479ecf06f00e6bcb0
child 4489 b338e03884fb46431a7900677f527b9cca86eb63
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs532656
Bug 532656 Fix Sunbird official branding on Mac. r=philipp
calendar/confvars.sh
calendar/sunbird/branding/nightly/configure.sh
configure.in
other-licenses/branding/sunbird/configure.sh
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -32,17 +32,19 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** 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
 MOZ_APP_VERSION=$SUNBIRD_VERSION
 MOZ_PLAINTEXT_EDITOR_ONLY=1
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
new file mode 100644
--- /dev/null
+++ b/calendar/sunbird/branding/nightly/configure.sh
@@ -0,0 +1,1 @@
+MOZ_APP_DISPLAYNAME=Calendar
--- a/configure.in
+++ b/configure.in
@@ -4918,17 +4918,16 @@ MOZ_ARG_ENABLE_BOOL(official-branding,
 [  --enable-official-branding Enable Official mozilla.org Branding
                           Do not distribute builds with
                           --enable-official-branding unless you have
                           permission to use trademarks per
                           http://www.mozilla.org/foundation/trademarks/ .],
 [case "$MOZ_BUILD_APP" in
 calendar)
     MOZ_BRANDING_DIRECTORY=other-licenses/branding/sunbird
-    MOZ_APP_DISPLAYNAME=Sunbird
     ;;
 
 mail)
     MOZ_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
     ;;
 
 *)]
     AC_MSG_ERROR([Official branding is only available for Sunbird and Thunderbird.])
new file mode 100644
--- /dev/null
+++ b/other-licenses/branding/sunbird/configure.sh
@@ -0,0 +1,1 @@
+MOZ_APP_DISPLAYNAME=Sunbird