Bug 1201712 - Package Firefox OS fonts r=nalexander
authorFabrice Desré <fabrice@mozilla.com>
Fri, 04 Sep 2015 09:34:28 -0700
changeset 293589 da38662146228e3b9554322b3b37edfde34defd9
parent 293453 538ccb262ec9f022b198d5fbe57a9c99c7eee9b7
child 293590 c24f124d18bf9b797bc63d420cdb8b6aaab85ddd
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1201712
milestone43.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 1201712 - Package Firefox OS fonts r=nalexander
build/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -59,16 +59,19 @@ YCM_FILES := $(topsrcdir)/.ycm_extra_con
 YCM_DEST := $(abspath $(DEPTH))
 YCM_TARGET := export
 INSTALL_TARGETS += YCM
 
 ifdef MOZTTDIR
 # Install the Firefox OS fonts.
 include $(MOZTTDIR)/fonts.mk
 MOZTT_DEST = $(FINAL_TARGET)/fonts
+ifdef MOZ_B2GDROID
+MOZTT_DEST = $(FINAL_TARGET)/res/fonts
+endif
 MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
 INSTALL_TARGETS += MOZTT
 endif
 
 ifdef MOZ_VALGRIND
 _VALGRIND_DIR = $(DEPTH)/_valgrind
 GARBAGE_DIRS += $(_VALGRIND_DIR)