2015-03-29 05:03:54 +03:00
|
|
|
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
|
|
|
|
|
index b7e2fbf..5ff23db 100644
|
|
|
|
|
--- a/crawl-ref/source/Makefile
|
|
|
|
|
+++ b/crawl-ref/source/Makefile
|
|
|
|
|
@@ -273,7 +273,7 @@ endif
|
|
|
|
|
LIBZ := contrib/install/$(ARCH)/lib/libz.a
|
|
|
|
|
|
|
|
|
|
ifndef CROSSHOST
|
|
|
|
|
- SQLITE_INCLUDE_DIR := /usr/include
|
2016-05-28 13:56:59 +03:00
|
|
|
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
|
2015-03-29 05:03:54 +03:00
|
|
|
else
|
|
|
|
|
# This is totally wrong, works only with some old-style setups, and
|
|
|
|
|
# on some architectures of Debian/new FHS multiarch -- excluding, for
|
|
|
|
|
@@ -943,7 +943,7 @@ else
|
|
|
|
|
SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
|
|
|
|
|
{\
|
|
|
|
|
fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
|
|
|
|
|
- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
|
|
|
|
|
+ for dir in ${dejavu_fonts}/share/fonts;\
|
|
|
|
|
do [ -d $$dir ] && echo $$dir; done;\
|
|
|
|
|
} | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
|
|
|
|
|
ifneq (,$(SYS_PROPORTIONAL_FONT))
|
|
|
|
|
@@ -968,7 +968,7 @@ else
|
|
|
|
|
SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
|
|
|
|
|
{\
|
|
|
|
|
fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
|
|
|
|
|
- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
|
|
|
|
|
+ for dir in ${dejavu_fonts}/share/fonts;\
|
|
|
|
|
do [ -d $$dir ] && echo $$dir; done;\
|
|
|
|
|
} | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
|
|
|
|
|
ifneq (,$(SYS_MONOSPACED_FONT))
|
