Bug 728840 - chrome directory missing in fresh profiles. r=Callek
authorJens Hatlak <jh@junetz.de>
Sun, 11 Mar 2012 00:02:48 +0100
changeset 9604 dc8ad83b7b861bfa8661faa252cc04f4654dd60f
parent 9603 b438e21e3c6b36f3b608460b6c043d7d32e9773d
child 9605 9dd6d8a41878bc2dc2a02fa1673e6e7e260f63ef
push id7335
push userjh@junetz.de
push dateSat, 10 Mar 2012 23:54:15 +0000
treeherdercomm-central@dc8ad83b7b86 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs728840
Bug 728840 - chrome directory missing in fresh profiles. r=Callek
suite/locales/Makefile.in
--- 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))