Commit 7f1bca84 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Revert "xserver_xorg-server: Use $(MAKE1) for make install" 



This reverts commit b7acacaf.

Closes #1855

We DO need to install into staging for all the xdriver-* packages,
so revert this commit.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent e1a7d916

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


	#1789: binutils fails to build for i386

	#1843: Fix libcap build failure

	#1855: XORG Keyboard driver fails to compile



2010.05-rc3, Released May 27th, 2010:

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+1 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver

XSERVER_XORG_SERVER_AUTORECONF = NO

XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO

XSERVER_XORG_SERVER_INSTALL_STAGING = YES

XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS

XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
@@ -136,8 +137,5 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) 
XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx

endif



define XSERVER_XORG_SERVER_INSTALL_TARGET_CMDS

	$(MAKE1) $(XSERVER_XORG_SERVER_INSTALL_TARGET_OPT) -C $(@D)

endef



$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))