From 466bcaa037ca7b6020763791c13ff57280643085 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 14 Mar 2005 14:34:12 +0000
Subject: [PATCH] Bug 285757 - Builds with official branding use wrong version
 of browserconfig.properties (regression from bug 282057) r=mconnor

git-svn-id: svn://10.0.0.236/trunk@170627 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mozilla/browser/base/Makefile.in b/mozilla/browser/base/Makefile.in
index 2079d25e2ce..2479395fdfc 100644
--- a/mozilla/browser/base/Makefile.in
+++ b/mozilla/browser/base/Makefile.in
@@ -56,8 +56,10 @@ ifneq (,$(filter windows gtk2, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
 
+ifndef MOZ_USE_OFFICIAL_BRANDING
 libs locale::
 	$(INSTALL) $(srcdir)/content/browserconfig.properties $(DIST)/bin
 
 install::
 	$(INSTALL) $(srcdir)/content/browserconfig.properties $(DESTDIR)$(mozappdir)
+endif