From 3ab5daf2d1316847e15ded7baed2892f67129e7b Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 23 Jun 2012 20:10:52 +0200 Subject: [PATCH] Use pkg-config to figure out libdbus cflags/libs This fixes compilation on recent Debian multiarch systems. --- config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 2af7fd8..891807e 100644 --- a/config.mk +++ b/config.mk @@ -17,8 +17,8 @@ XINERAMAFLAGS = -DXINERAMA INIFLAGS = -DINI_ALLOW_MULTILINE=0 # includes and libs -INCS = -I${X11INC} -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 ${XFTINC} -LIBS = -L${X11LIB} -lX11 -lXss -ldbus-1 ${XFTLIBS} ${XINERAMALIBS} +INCS = -I${X11INC} $(shell pkg-config --cflags dbus-1) ${XFTINC} +LIBS = -L${X11LIB} -lX11 -lXss ${XFTLIBS} ${XINERAMALIBS} $(shell pkg-config --libs dbus-1) # flags CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS}