diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 6ce64036db..e175b27330 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -23,21 +23,29 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros xkbcomp" PKG_SECTION="x11/data" PKG_SHORTDESC="xkeyboard-config: X keyboard extension data files" PKG_LONGDESC="X keyboard extension data files." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="XKBCOMP=/usr/bin/xkbcomp \ - --without-xsltproc \ +if [ "$DISPLAYSERVER" = "x11" ]; then + PKG_DEPENDS_TARGET="toolchain util-macros xkbcomp" + DISPLAYSERVER_XKEYBOARD="XKBCOMP=/usr/bin/xkbcomp \ + --with-xkb-base=$XORG_PATH_XKB \ + --with-xkb-rules-symlink=xorg" + +else + PKG_DEPENDS_TARGET="toolchain util-macros" + DISPLAYSERVER_XKEYBOARD="" +fi + +PKG_CONFIGURE_OPTS_TARGET="--without-xsltproc \ --enable-compat-rules \ - --enable-runtime-deps \ + --disable-runtime-deps \ --enable-nls \ --disable-rpath \ - --with-xkb-base=$XORG_PATH_XKB \ - --with-xkb-rules-symlink=xorg \ - --with-gnu-ld" + --with-gnu-ld \ + $DISPLAYSERVER_XKEYBOARD" pre_build_target() { # broken autoreconf