From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 10 Feb 2011 03:52:39 +0000 (+0000)
Subject: kernel-headers: get rid of the arch/$(ARCH)/include/asm vs include/asm-$(ARCH) copyin... 
X-Git-Tag: reboot~17617
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=29de442b0d2bb879d9f41891d23fc876d675af05;p=openwrt%2Fstaging%2Fxback.git

kernel-headers: get rid of the arch/$(ARCH)/include/asm vs include/asm-$(ARCH) copying mess and stick to what the kernel is using

SVN-Revision: 25443
---

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 614c405155..2a90e3d98a 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -46,21 +46,17 @@ define Host/Prepare/all
 	$(KMAKE) \
 		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
 		headers_install
-	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
-		mkdir -p $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH); \
-		$(CP) \
-			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-			$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
-	fi
 endef
 
 # XXX: the following is needed to build lzma-loader
-define Host/Prepare/lzma
+ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+  define Host/Prepare/lzma
 	$(CP) \
-		$(HOST_BUILD_DIR)/include/asm-mips/asm.h \
-		$(HOST_BUILD_DIR)/include/asm-mips/regdef.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
-endef
+  endef
+endif
 
 define Host/Prepare/post/cris
 	$(CP) \