Bug 925796 - Fix bookmark creation for Metro l10n repacks [r=gps]
authorMatt Brubeck <mbrubeck@mozilla.com>
Thu, 17 Oct 2013 10:51:12 -0700
changeset 166003 1cb3ba2ab9c173ea6e5e53681198d4883a96f7ee
parent 166002 00a62ede0d4d9ab533f0b2dd1ce6a70f17521176
child 166004 1374158dab4b8d334ca41a19405a97a92cd0f084
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs925796
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 925796 - Fix bookmark creation for Metro l10n repacks [r=gps]
browser/metro/locales/import/Makefile.in
--- a/browser/metro/locales/import/Makefile.in
+++ b/browser/metro/locales/import/Makefile.in
@@ -25,19 +25,21 @@ include $(topsrcdir)/config/rules.mk
 libs::
 	$(MAKE) -C $(DEPTH)/browser/locales searchplugins \
 	  DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID="$(XPI_ROOT_APPID)"
 
 #########################################
 # Bookmarks
 
 # Pick up desktop's bookmarks.inc file
+ifdef LOCALE_MERGEDIR
+vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
+endif
 vpath book%.inc $(LOCALE_SRCDIR)/profile
 ifdef LOCALE_MERGEDIR
-vpath book%.inc $(LOCALE_SRCDIR)/profile
 vpath book%.inc @top_srcdir@/$(relativesrcdir)/en-US/profile
 endif
 
 bookmarks-src = $(srcdir)/../generic/profile/bookmarks.json.in
 
 # The resulting bookmarks.json will get picked up and packaged by the
 # processing of the jar file in the parent directory.
 bookmarks: bookmarks.inc