Making the fontconfig and freetype paths portable in config.mk.

12 years ago · 4682cc9596
parent 4e14a4a97f
commit 4682cc9596
1 changed files with 6 additions and 2 deletions
--- a/config.mk
+++ b/config.mk
@ -11,8 +11,12 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib

 # includes and libs
-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
+INCS = -I. -I/usr/include -I${X11INC} \
+       $(shell pkg-config --cflags fontconfig) \
+       $(shell pkg-config --cflags freetype2)
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
+       $(shell pkg-config --libs fontconfig)  \
+       $(shell pkg-config --libs freetype2)

 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"