From 5ce36cbb20aa8d96145a1fe5e9e59794224c82df Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 3 Aug 2007 01:21:41 +0000
Subject: [PATCH] fix image installation

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8324 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/image.mk        | 7 +++++--
 include/kernel-build.mk | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index d00f779fe..b09442877 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -8,6 +8,9 @@
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
+
+override MAKEFLAGS=
+override MAKE:=$(SUBMAKE)
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 ifneq ($(CONFIG_BIG_ENDIAN),y)
@@ -94,14 +97,14 @@ define BuildImage
 download:
 prepare:
 ifneq ($(IB),1)
-  compile: compile-targets
+  compile: compile-targets FORCE
 	$(call Build/Compile)
 else
   compile:
 endif
 
 ifneq ($(IB),1)
-  install: compile install-targets
+  install: compile install-targets FORCE
 	$(call Image/Prepare)
 	$(call Image/mkfs/prepare)
 	$(call Image/BuildKernel)
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index b3fcd9056..da1fe39bc 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -174,7 +174,7 @@ oldconfig menuconfig: $(STAMP_PREPARED) FORCE
 	$(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image
-	$(MAKE) -C image install
+	$(MAKE) -C image compile install
 
 clean: FORCE
 	rm -f $(STAMP_DIR)/.linux-compile
@@ -188,6 +188,6 @@ rebuild: FORCE
 	@$(MAKE) compile
 
 image-prereq:
-	$(MAKE) -s -C image prereq
+	$(SUBMAKE) -s -C image prereq
 
 prereq: image-prereq
-- 
2.20.1