From b7acacaf6e84ec05ed76dd419e645cfbd6683f7a Mon Sep 17 00:00:00 2001 From: Paulius Zaleckas Date: Fri, 28 May 2010 17:58:43 +0300 Subject: [PATCH] xserver_xorg-server: Use $(MAKE1) for make install Xserver installation fails with parallel make jobs. Installation to staging is not needed. So just remove it instead of converting to $(MAKE1). Signed-off-by: Paulius Zaleckas Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 6c6017bac6..a49c180771 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,7 +9,6 @@ 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 @@ -137,5 +136,8 @@ 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)) -- 2.30.2