Trying to fix distclean not actually removing dist/ when --enable-official-branding is used, due to the branding directory being in the directories list twice. Rather than re-jar from the branding directory, copy the new graphics to browser/base/content in the objdir, where make-jars.pl will pick them up. Also, some tidying up of the branding Makefile. Not part of the default build.

Makefile.in

@@ -325,12 +325,6 @@ endif # MOZ_COMPONENTLIB
 
 ifdef MOZ_PHOENIX
 tier_99_dirs	+= browser xpfe/bootstrap/init.d
-
-# Need to build here *again* _after_browser_ to ensure jar'ed chrome
-# is processed.
-ifdef MOZ_USE_OFFICIAL_BRANDING
-tier_99_dirs  += other-licenses/branding/firefox
-endif
 endif
 
 ifdef MOZ_THUNDERBIRD

other-licenses/branding/firefox/Makefile.in

@@ -12,19 +12,31 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
+BROWSER_APP_FILES = \
+	default.xpm \
+	mozicon16.xpm \
+	mozicon50.xpm \
+	firefox.ico \
+	document.ico \
+	$(NULL)
+
+BROWSER_CONTENT_FILES = \
+	aboutCredits.png \
+	aboutFooter.png \
+	about.png \
+	$(NULL)
+
 export::
-	@echo "********************************* goats"
-	cp $(srcdir)/default.xpm $(DEPTH)/browser/app/default.xpm
-	cp $(srcdir)/mozicon16.xpm $(DEPTH)/browser/app/mozicon16.xpm
-	cp $(srcdir)/mozicon50.xpm $(DEPTH)/browser/app/mozicon50.xpm
-	cp $(srcdir)/firefox.ico $(DEPTH)/browser/app/firefox.ico
-	cp $(srcdir)/firefox.ico $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/browser.ico
+	cp $(addprefix $(srcdir)/, $(BROWSER_APP_FILES)) $(DEPTH)/browser/app/
+	if [ ! -d $(DEPTH)/browser/base/content ] ; then \
+		mkdir $(DEPTH)/browser/base/content; \
+	fi
+	cp $(addprefix $(srcdir)/, $(BROWSER_CONTENT_FILES)) $(DEPTH)/browser/base/content/
 	if [ ! -d $(DEPTH)/browser/app/macbuild ] ; then \
 		mkdir $(DEPTH)/browser/app/macbuild; \
 	fi
 	cp $(srcdir)/firefox.icns $(DEPTH)/browser/app/macbuild/firefox.icns
 	cp $(srcdir)/document.icns $(DEPTH)/browser/app/macbuild/document.icns
-	cp $(srcdir)/document.ico $(DEPTH)/browser/app/document.ico
+	cp $(srcdir)/firefox.ico $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/browser.ico
 	cp $(srcdir)/Header.bmp $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/Header.bmp
 	cp $(srcdir)/Watermrk.bmp $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/Watermrk.bmp
-

other-licenses/branding/firefox/jar.mn

@@ -1,7 +0,0 @@
-# Override files in base package with trademarked artwork.
-
-browser.jar:
-+       content/browser/aboutCredits.png
-+       content/browser/aboutFooter.png
-+       content/browser/about.png
-