summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-30 18:11:23 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-05-30 18:12:52 (GMT)
commit7f1bca8479f9fbec3705fb91df4452fb591d4362 (patch)
tree5e028b704837b71488adf8af4733af7e5c874460
parente1a7d916e9eeaa215551740de40c055130d6c073 (diff)
downloadbuildroot-7f1bca8479f9fbec3705fb91df4452fb591d4362.tar.gz
buildroot-7f1bca8479f9fbec3705fb91df4452fb591d4362.tar.bz2
Revert "xserver_xorg-server: Use $(MAKE1) for make install"
This reverts commit b7acacaf6e84ec05ed76dd419e645cfbd6683f7a. Closes #1855 We DO need to install into staging for all the xdriver-* packages, so revert this commit. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES1
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 26dab3c..07ab75b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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:
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index a49c180..6c6017b 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -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))