1 diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
2 index f8b576fd63..b95c21c0a1 100755
3 --- a/crawl-ref/source/util/find_font
4 +++ b/crawl-ref/source/util/find_font
8 -FONTDIRS="/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts"
9 +FONTDIRS="${fontsPath}/share/fonts"
12 [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
13 @@ -11,6 +11,6 @@ name=$1
14 for dir in $FONTDIRS; do
15 [ -d "$dir" ] && echo "$dir"
17 - } | xargs -I% find % \( -type f -o -type l \) -iname "$name" -print \
18 + } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \
21 diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
22 index e29ccff507..9bf01e040a 100644
23 --- a/crawl-ref/source/windowmanager-sdl.cc
24 +++ b/crawl-ref/source/windowmanager-sdl.cc
27 # include <SDL2/SDL.h>
29 -# include <SDL_image.h>
30 +# include <SDL2/SDL_image.h>
31 # if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS)
32 # include <SDL2/SDL_mixer.h>