2 files changed, 13 insertions, 13 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 9e3a781384..b11653190e 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -10,6 +10,8 @@ curdir:=toolchain
 
 # subdirectories to descend into
 $(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)
+$(curdir)/builddirs-compile:=. $(filter-out kernel-headers,$($(curdir)/builddirs))
+$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)
 
 # builddir dependencies
 $(curdir)/uClibc/prepare:=$(curdir)/kernel-headers/prepare
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index fadde33dbd..d51f91d3a8 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -34,18 +34,6 @@ define Build/Prepare/cris
 	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 endef
 
-ifdef Build/Prepare/$(ARCH)
-define Build/Prepare
-	$(call Build/Prepare/$(ARCH))
-endef
-else
-define Build/Prepare
-	$(call Kernel/Prepare/Default)
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
-endef
-endif
-
 define Build/Configure/powerpc
 	$(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
 	rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
@@ -60,12 +48,22 @@ KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
 	CONFIG_SHELL=$(BASH)
 
-define Build/Configure
+define Build/Prepare/Default
+	$(call Kernel/Prepare/Default)
+	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
+	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+endef
+
+define Build/Prepare
+	$(if $(Build/Prepare/$(ARCH)),$(Build/Prepare/$(ARCH)),$(Build/Prepare/Default))
 	yes '' | $(KMAKE) oldconfig
 	$(KMAKE) include/linux/version.h include/asm
 	$(call Build/Configure/$(ARCH))
 endef
 
+define Build/Configure
+endef
+
 define Build/Compile
 endef