diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-08-03 01:21:41 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-08-03 01:21:41 +0000 |
| commit | 5ce36cbb20aa8d96145a1fe5e9e59794224c82df (patch) | |
| tree | 78b00c052af6f13a91994d9b97337edc0d6b5224 | |
| parent | ce46ec90199b717bb1c28fe11e5a8034702fbad5 (diff) | |
fix image installation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8324 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/image.mk | 7 | ||||
| -rw-r--r-- | 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 |