summaryrefslogtreecommitdiff
path: root/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-07-27 22:52:19 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-07-27 22:52:19 +0200
commit3fdf280568b01a7fa971ddc63e84fdbea11e691b (patch)
treeeb3a20ab1e5fbe9bec5e863d68b28edc6e71550b /package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
parentf2860bbc8ea6ff959b91eaa8919177d273ee4497 (diff)
parent3c77bab2eeace3ee675bd745ca335fa3dd1630bb (diff)
Merge branch 'various-bumps' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/x11r7/xserver_xorg-server/xserver_xorg-server.mk')
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 7c12d2454..d9ea57083 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -53,6 +53,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xf86rushproto \
xproto_xf86vidmodeproto \
xproto_xproto \
+ xkeyboard-config \
pixman \
openssl \
mcookie
@@ -60,7 +61,8 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
--disable-xnest --disable-xephyr --disable-xvfb \
--with-builder-addr=buildroot@uclibc.org \
- CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
+ CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" \
+ --with-fontdir=/usr/share/fonts/X11/
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx