at v192 31 lines 1.4 kB view raw
1diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile 2index b7e2fbf..5ff23db 100644 3--- a/crawl-ref/source/Makefile 4+++ b/crawl-ref/source/Makefile 5@@ -273,7 +273,7 @@ endif 6 LIBZ := contrib/install/$(ARCH)/lib/libz.a 7 8 ifndef CROSSHOST 9- SQLITE_INCLUDE_DIR := /usr/include 10+ SQLITE_INCLUDE_DIR := ${sqlite}/include 11 else 12 # This is totally wrong, works only with some old-style setups, and 13 # on some architectures of Debian/new FHS multiarch -- excluding, for 14@@ -943,7 +943,7 @@ else 15 SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\ 16 {\ 17 fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ 18- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ 19+ for dir in ${dejavu_fonts}/share/fonts;\ 20 do [ -d $$dir ] && echo $$dir; done;\ 21 } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) 22 ifneq (,$(SYS_PROPORTIONAL_FONT)) 23@@ -968,7 +968,7 @@ else 24 SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\ 25 {\ 26 fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ 27- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ 28+ for dir in ${dejavu_fonts}/share/fonts;\ 29 do [ -d $$dir ] && echo $$dir; done;\ 30 } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) 31 ifneq (,$(SYS_MONOSPACED_FONT))