Xinqi Bao's Git
projects
/
st.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
4e14a4a
)
Making the fontconfig and freetype paths portable in config.mk.
author
Christoph Lohmann <
[email protected]
>
Fri, 4 Jan 2013 19:52:22 +0000
(20:52 +0100)
committer
Christoph Lohmann <
[email protected]
>
Fri, 4 Jan 2013 19:52:22 +0000
(20:52 +0100)
config.mk
diff
|
blob
|
history
diff --git
a/config.mk
b/config.mk
index
f1757ed
..
ecc5c83
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-11,8
+11,12
@@
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
# includes and libs
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}\"
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\"