tMaking the fontconfig and freetype paths portable in config.mk. - st - [fork] … | |
git clone git://src.adamsgaard.dk/st | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 4682cc9596a5c82325882bdf1313728de95467d2 | |
parent 4e14a4a97f7f7ef134fdc25d2fa34c8db7bb6e6c | |
Author: Christoph Lohmann <[email protected]> | |
Date: Fri, 4 Jan 2013 20:52:22 +0100 | |
Making the fontconfig and freetype paths portable in config.mk. | |
Diffstat: | |
M config.mk | 8 ++++++-- | |
1 file changed, 6 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/config.mk b/config.mk | |
t@@ -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}\" |