comm-central: changeset 1025:ab359929972380c626d7584b5634eb0860506c32

author	Mark Banner <bugzilla@standard8.plus.com>
	Wed, 05 Nov 2008 14:53:34 +0000
changeset 1025	ab359929972380c626d7584b5634eb0860506c32
parent 1024	7d1219fe35d86744fea37a957e673bbfb4a0111a
child 1026	8503d3f60e3612b8f97588c37ba4688e770a86c9
push id	763
push user	bugzilla@standard8.plus.com
push date	Wed, 05 Nov 2008 14:54:57 +0000
treeherder	comm-central@ab3599299723 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	KaiRo
bugs	461051

Bug 461051 Thunderbird and Sunbird build failure with --enable-official_branding. r=KaiRo

--- a/calendar/makefiles.sh
+++ b/calendar/makefiles.sh
@@ -41,10 +41,18 @@ if [ "$COMM_BUILD" ]; then
 
 add_makefiles "
 calendar/sunbird/Makefile
 calendar/sunbird/app/Makefile
 calendar/sunbird/base/Makefile
 calendar/sunbird/locales/Makefile
 "
 
+if test -n "$MOZ_BRANDING_DIRECTORY"; then
+  add_makefiles "
+    $MOZ_BRANDING_DIRECTORY/Makefile
+    $MOZ_BRANDING_DIRECTORY/content/Makefile
+    $MOZ_BRANDING_DIRECTORY/locales/Makefile
+  "
+fi
+
  . ${srcdir}/calendar/shared_makefiles.sh
 fi

--- a/mail/makefiles.sh
+++ b/mail/makefiles.sh
@@ -59,9 +59,17 @@ mail/installer/windows/Makefile
 mail/themes/Makefile
 mail/themes/pinstripe/mail/Makefile
 mail/themes/pinstripe/editor/Makefile
 mail/themes/pinstripe/Makefile
 mail/themes/qute/mail/Makefile
 mail/themes/qute/editor/Makefile
 mail/themes/qute/Makefile
 "
+
+if test -n "$MOZ_BRANDING_DIRECTORY"; then
+  add_makefiles "
+    $MOZ_BRANDING_DIRECTORY/Makefile
+    $MOZ_BRANDING_DIRECTORY/locales/Makefile
+  "
 fi
+
+fi

calendar/makefiles.sh		file \| annotate \| diff \| comparison \| revisions
mail/makefiles.sh		file \| annotate \| diff \| comparison \| revisions