From fd8946160abb6bd8aaf67b9c18b43a1748c8d366 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 22 May 2008 12:51:14 +0000 Subject: [PATCH 1/1] fixes conditional in Xorg Makefile SVN-Revision: 11238 --- XOrg/server/xorg-server-X11R7.2/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile index fcd4949bf7..e28f5e347f 100644 --- a/XOrg/server/xorg-server-X11R7.2/Makefile +++ b/XOrg/server/xorg-server-X11R7.2/Makefile @@ -27,9 +27,9 @@ CONFIGURE_ARGS_KDRIVE=--enable-composite --enable-kdrive \ --disable-xevie --disable-xprint --disable-xtrap \ --disable-dmx --disable-w100 \ --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate + --enable-tslib --enable-xcalibrate -CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes +CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes CONFIGURE_ARGS+=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(CONFIGURE_ARGS_KDRIVE)) DEPENDS_SERVER:=+calibrateproto \ @@ -92,10 +92,10 @@ DEPENDS_KDRIVE:=+calibrateproto \ +libXrandr \ +xtrans \ +libX11 \ - @DISPLAY_SUPPORT + @DISPLAY_SUPPORT -ifneq ($(CONFIG_TARGET_olpc),) +ifeq ($(CONFIG_TARGET_olpc),y) XORG_CONFIG_FILE=xorg-olpc.conf else XORG_CONFIG_FILE=xorg.conf -- 2.30.2