create fonts dir in OUTPUT_DIR to avoid polluting mupdf

koreader · Jan 1, 2014 · 8b9989a · 8b9989a
1 parent a4f9935
commit 8b9989a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -20,8 +20,11 @@ endif
 	# while cr3.css is in /kpvcrlib, so we need three ".."
 	test -e $(OUTPUT_DIR)/data/cr3.css || \
 		ln -sf ../../../cr3.css $(OUTPUT_DIR)/data/
-	test -d $(OUTPUT_DIR)/fonts || \
-		ln -sf ../../$(TTF_FONTS_DIR) $(OUTPUT_DIR)/fonts
+	test -d $(OUTPUT_DIR)/fonts || ( \
+			mkdir $(OUTPUT_DIR)/fonts && \
+			cd $(OUTPUT_DIR)/fonts && \
+			ln -sf ../../../$(MUPDF_TTF_FONTS_DIR)/* . \
+		)
 	test -e $(OUTPUT_DIR)/koreader-base || \
 		ln -sf ../../koreader-base $(OUTPUT_DIR)/
 	test -e $(OUTPUT_DIR)/ffi || \

diff --git a/Makefile.defs b/Makefile.defs
@@ -162,7 +162,7 @@ LEPTONICA_LIB=$(OUTPUT_DIR)/libs/liblept.so.3
 TESSERACT_LIB=$(OUTPUT_DIR)/libs/libtesseract.so.3
 
 # must point to directory with *.ttf fonts for crengine
-TTF_FONTS_DIR=$(MUPDF_DIR)/resources/fonts
+MUPDF_TTF_FONTS_DIR=$(MUPDF_DIR)/resources/fonts
 
 # CFLAGS for the Lua/C/C++ modules:
 #