Bug 728840 - chrome directory missing in fresh profiles. r+a=Callek
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -143,26 +143,26 @@ PANELS_XTRA_FILE = $(call MERGE_FILE,pro
profile/panels.rdf.in > $@
libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
-libs:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
install:: $(DESTDIR)$(mozappdir)/defaults/profile/panels.rdf ;
install:: $(addprefix generic/profile/,$(PROFILE_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
install:: $(addsuffix .xml,$(SEARCH_PLUGINS))