summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulius Zaleckas <paulius.zaleckas@gmail.com>2010-05-28 14:58:43 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-05-28 20:47:52 (GMT)
commitb7acacaf6e84ec05ed76dd419e645cfbd6683f7a (patch)
treec2bfd9da1a272aa42049aba4539fbe120a2ab212
parentb578f670d153a04cc410e0696013e9c606f38439 (diff)
downloadbuildroot-b7acacaf6e84ec05ed76dd419e645cfbd6683f7a.tar.gz
buildroot-b7acacaf6e84ec05ed76dd419e645cfbd6683f7a.tar.bz2
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 <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
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))