Bug 1235108 - Stop using the -I option to force-include bookmarks.inc in bookmarks.html.in. r=gps

Use a #include instead.

browser/locales/Makefile.in

@@ -105,7 +105,7 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
 
 %/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 $< \
+	  -DBOOKMARKS_INCLUDE_DIR=$(<D) \
 	  -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
 	  $(srcdir)/generic/profile/bookmarks.html.in \
 	  -o $@)

browser/locales/generic/profile/bookmarks.html.in

@@ -1,4 +1,5 @@
 #filter substitution
+#include @BOOKMARKS_INCLUDE_DIR@/bookmarks.inc
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->