From 819bbdd0c9124dc2b319093171dcc6092a589eb0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Oct 2013 10:33:38 +0200
Subject: [PATCH] kernel-libc-headers: misc tweaks.

---
 srcpkgs/kernel-libc-headers/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index d6405d8fda..d92ab69a35 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -12,25 +12,23 @@ checksum=ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
 
 bootstrap=yes
 
-if [ -n "$IN_CHROOT" ]; then
+if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
 fi
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	_arch="ARCH=x86"
-elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-	_arch="ARCH=arm"
-else
-	msg_error "$pkgver: unknown architecture.\n"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	i686|x86_64) _arch="x86";;
+	arm*) _arch="arm";;
+	*) msg_error "$pkgver: unknown architecture.\n";;
+esac
 
 do_build() {
 	make mrproper
-	make ${_arch} headers_check
+	make ARCH=${_arch} headers_check
 }
 
 do_install() {
-	make ${_arch} INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
+	make ARCH=${_arch} INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
 	# Remove unused files.
 	rm -f $(find ${DESTDIR}/usr/include -name .install -or -name ..install.cmd)
 	# Remove drm headers, use libdrm.
@@ -41,6 +39,6 @@ kernel-libc-headers_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }