From 9db5b4e4b57d9ff8ccbedeaabe7c72bb69e41f48 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Mon, 28 Aug 2006 20:17:06 +0000 Subject: [PATCH] Better bustage fix for the patch from bug 350453, r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@208664 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in index 5a19771f019..c03e65dc817 100644 --- a/mozilla/browser/app/Makefile.in +++ b/mozilla/browser/app/Makefile.in @@ -51,6 +51,10 @@ PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ $(srcdir)/profile/channel-prefs.js \ $(NULL) +ifndef MOZ_BRANDING_DIRECTORY +PREF_JS_EXPORTS += $(srcdir)/firefox-branding.js +endif + # hardcode en-US for the moment AB_CD = en-US @@ -308,8 +312,6 @@ endif export:: ifndef MOZ_BRANDING_DIRECTORY $(NSINSTALL) -D $(DIST)/branding - $(NSINSTALL) -D $(DIST)/bin/defaults/pref - cp $(srcdir)/firefox-branding.js $(DIST)/bin/defaults/pref/firefox-branding.js ifeq ($(OS_ARCH),WINNT) cp $(srcdir)/firefox.ico $(DIST)/branding/firefox.ico cp $(srcdir)/firefox.ico $(DIST)/branding/app.ico