Bug 461051 - "Thunderbird and Sunbird build failure with --enable-official_branding" [r=ted.mielczarek]
--- 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