Bug 461051 - "Thunderbird and Sunbird build failure with --enable-official_branding" [r=ted.mielczarek]
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 02 Dec 2008 10:48:32 +0000
changeset 22148 def8ca28ac75c62451916c3ea0332d098f82fcc1
parent 22147 5edef3a148a5f91b2b9b4b5bf536fb845f46750b
child 22149 96956634349c34be4469035052ee2dcfe6b1853b
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs461051
milestone1.9.2a1pre
Bug 461051 - "Thunderbird and Sunbird build failure with --enable-official_branding" [r=ted.mielczarek]
allmakefiles.sh
browser/makefiles.sh
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -91,16 +91,8 @@ for extension in $MOZ_EXTENSIONS; do
 done
 
 #
 # Toolkit makefiles
 #
 if test -z "$LIBXUL_SDK"; then
   . "${srcdir}/toolkit/toolkit-makefiles.sh"
 fi
-
-if test -n "$MOZ_BRANDING_DIRECTORY"; then
-  add_makefiles "
-    $MOZ_BRANDING_DIRECTORY/Makefile
-    $MOZ_BRANDING_DIRECTORY/content/Makefile
-    $MOZ_BRANDING_DIRECTORY/locales/Makefile
-  "
-fi
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -59,8 +59,15 @@ browser/installer/windows/Makefile
 browser/locales/Makefile
 browser/themes/Makefile
 browser/themes/pinstripe/browser/Makefile
 browser/themes/pinstripe/Makefile
 browser/themes/winstripe/browser/Makefile
 browser/themes/winstripe/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