Don't rely on MUPDF's fonts anymore.

koreader · Apr 27, 2015 · 3c42c5e · 3c42c5e
1 parent 6868065
commit 3c42c5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -44,9 +44,7 @@ endif
 	test -e $(OUTPUT_DIR)/data/cr3.css || \
 		ln -sf ../../../cr3.css $(OUTPUT_DIR)/data/
 	test -d $(OUTPUT_DIR)/fonts || ( \
-			mkdir $(OUTPUT_DIR)/fonts && \
-			cd $(OUTPUT_DIR)/fonts && \
-			ln -sf ../../../$(MUPDF_TTF_FONTS_DIR)/* . \
+			mkdir $(OUTPUT_DIR)/fonts \
 		)
 	test -e $(OUTPUT_DIR)/ffi || \
 		ln -sf ../../ffi $(OUTPUT_DIR)/

diff --git a/Makefile.defs b/Makefile.defs
@@ -363,9 +363,6 @@ LUA_SPORE_VER=$(LUA_SPORE)-$(SPORE_VER)
 LUA_SPORE_ROCKSPEC=rockspec/$(LUA_SPORE_VER).rockspec
 LUA_SPORE_ROCK=$(LUAROCKS_DIR)/lua-spore/$(SPORE_VER)/$(LUA_SPORE_VER).rockspec
 
-# must point to directory with *.ttf fonts for crengine
-MUPDF_TTF_FONTS_DIR=$(MUPDF_DIR)/resources/fonts
-
 # CFLAGS for the Lua/C/C++ modules:
 #
 # setting the rpath to '$ORIGIN' will make the dynamic linker search