fix uml-2.6 build with 2.6.19.1

[openwrt.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 4cd0199..3731673 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -26,14 +26,23 @@ define Build/Prepare
 endef
 
 define Build/Configure/powerpc
-       $(CP) $(PKG_BUILD_DIR)/include/asm-powerpc/* $(PKG_BUILD_DIR)/include/asm-ppc/
+       $(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
+       rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
+       mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
 endef
 
-define Build/Configure
-       yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
+ifneq (,$(findstring uml,$(BOARD)))
+  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+               CONFIG_SHELL=$(BASH)
+else
+  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
                ARCH=$(LINUX_KARCH) \
-               CONFIG_SHELL=$(BASH) \
-               oldconfig include/linux/version.h include/asm
+               CONFIG_SHELL=$(BASH)
+endif
+
+define Build/Configure
+       yes '' | $(KMAKE) oldconfig
+       $(KMAKE) include/linux/version.h include/asm
        $(call Build/Configure/$(ARCH))
 endef