Bug 1235108 - Stop using vpaths for bookmarks.inc. r=gps

browser/locales/Makefile.in

@@ -12,13 +12,6 @@ vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter
 ifdef LOCALE_MERGEDIR
 vpath crashreporter%.ini @srcdir@/en-US/crashreporter
 endif
-ifdef LOCALE_MERGEDIR
-vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
-endif
-vpath book%.inc $(LOCALE_SRCDIR)/profile
-ifdef LOCALE_MERGEDIR
-vpath book%.inc @srcdir@/en-US/profile
-endif
 
 
 SUBMAKEFILES += \
@@ -110,7 +103,7 @@ PROFILE_CHROME = userChrome-example.css userContent-example.css
 
 NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
 
-%/chrome/$(AB_CD)/locale/browser/bookmarks.html: bookmarks.inc generic/profile/bookmarks.html.in
+%/chrome/$(AB_CD)/locale/browser/bookmarks.html: $(call MERGE_FILE,profile/bookmarks.inc) generic/profile/bookmarks.html.in $(GLOBAL_DEPS)
 	$(call py_action,preprocessor, \
 	  -I $< \
 	  -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \