From 55d4bd88164f02e33d2c3d75a036437c50afe40e Mon Sep 17 00:00:00 2001
From: Manuel Reimer <manuel.reimer@gmx.de>
Date: Thu, 10 May 2018 18:58:16 +0200
Subject: Fix building against freetype2 2.9.1

---
 glcdgraphics/Makefile  | 9 ++-------
 tools/genfont/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/glcdgraphics/Makefile b/glcdgraphics/Makefile
index cba3a37..98cbbbc 100644
--- a/glcdgraphics/Makefile
+++ b/glcdgraphics/Makefile
@@ -41,14 +41,9 @@ DEPFILE = $(OBJS:%.o=%.d)
 -include $(DEPFILE)
 
 ifdef HAVE_FREETYPE2
-	ifneq ($(shell which freetype-config),)
-		INCLUDES += $(shell freetype-config --cflags)
-		LIBS += $(shell freetype-config --libs)
-	else
-		INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-		LIBS += -lfreetype
-	endif
 	DEFINES += -DHAVE_FREETYPE2
+	INCLUDES += $(shell pkg-config freetype2 --cflags)
+	LIBS += $(shell pkg-config freetype2 --libs)
 endif
 
 # two ifdef/endif are used because older installations may not support 'else ifdef'
diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile
index c4aab2f..1a68ad0 100644
--- a/tools/genfont/Makefile
+++ b/tools/genfont/Makefile
@@ -9,10 +9,10 @@ PRGNAME = genfont
 OBJS = genfont.o
 
 INCLUDES += -I../../
-INCLUDES += `freetype-config --cflags`
+INCLUDES += $(shell pkg-config freetype2 --cflags)
 
 LIBDIRS += -L../../glcdgraphics/
-LIBS += `freetype-config --libs`
+LIBS += $(shell pkg-config freetype2 --libs)
 
 all: $(PRGNAME)
 .PHONY: all
-- 
cgit v1.2.3