# HG changeset patch # User Alan Coopersmith # Date 1233340682 28800 # Node ID 1a987df95a37ce01ef48f23c811091a6111e7f15 # Parent 74f07dae770f6aa3d7298c242f876208afe9307c Disable Xprint due to build errors introduced by 6793256 diff -r 74f07dae770f -r 1a987df95a37 open-src/xserver/xorg/Makefile --- a/open-src/xserver/xorg/Makefile Fri Jan 30 10:32:03 2009 -0800 +++ b/open-src/xserver/xorg/Makefile Fri Jan 30 10:38:02 2009 -0800 @@ -30,7 +30,7 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. # -# @(#)Makefile 1.73 09/01/27 +# @(#)Makefile 1.74 09/01/30 # # Build 32-bit or 64-bit? @@ -90,7 +90,7 @@ # Need to override LD setting to add -xarch flags that libtool strips # XXX: --disable-dga MODULE_CONFIG_OPTS = $(XSERVER_CONFIG_OPTS) \ - --enable-builddocs --enable-xorgcfg --enable-xprint \ + --enable-builddocs --enable-xorgcfg --disable-xprint \ --enable-kdrive --enable-xephyr --disable-xsdl \ MKFONTDIR="$(MKFONTDIR)" \ MKFONTSCALE="$(MKFONTSCALE)" \ @@ -130,6 +130,9 @@ mkdir -p $(PROTODIR)$(X11_DIR)/share/hal/fdi/policy/10osvendor cp -p $(SOURCE_DIR)/config/x11-input.fdi \ $(PROTODIR)$(X11_DIR)/share/hal/fdi/policy/10osvendor/10-x11-input.fdi + (cd $(SOURCE_DIR)/hw/xprint/doc && \ + $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) \ + $(DEFAULT_INSTALL_MAKEFLAGS) install) # Install xorg-server.pc in 32-bit pkgconfig dir on SPARC too install_pc: install_pkgconfig_uninstalled