From: blogic Date: Thu, 22 May 2008 12:51:14 +0000 (+0000) Subject: fixes conditional in Xorg Makefile X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=139ad8288eadc8a29c492c03052432f4e1b95b31;p=packages.git fixes conditional in Xorg Makefile git-svn-id: svn://svn.openwrt.org/openwrt/packages@11238 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile index fcd4949bf..e28f5e347 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