[Buildroot] [git commit master] xserver_xorg-server: Use $(MAKE1) for make install

[Buildroot] [git commit master] xserver_xorg-server: Use $(MAKE1) for make install

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=41c49b3c9f48958656213ebb28f3f3e1817ed600
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Xserver installation fails with parallel make jobs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xserver_xorg-server/xserver_xorg-server.mk     |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 6c6017b..4aba941 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -7,6 +7,7 @@
 XSERVER_XORG_SERVER_VERSION = 1.7.5
 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_XSERVER_MAKE = $(MAKE1) # make install fails with parallel make
 XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-- 
1.6.3.3

[Buildroot] [git commit master] xserver_xorg-server: Use $(MAKE1) for make install

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=b7acacaf6e84ec05ed76dd419e645cfbd6683f7a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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 <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xserver_xorg-server/xserver_xorg-server.mk     |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 6c6017b..a49c180 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))
-- 
1.6.3.3