From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 2 Jun 2006 16:27:15 +0000 (+0000)
Subject: run defconfig at the start of a normal make run to get additional config options
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0cde379fb90322fd91948ad4c5be9c89b992933f;p=openwrt%2Fstaging%2Fthess.git

run defconfig at the start of a normal make run to get additional config options

SVN-Revision: 3897
---

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 84508b1ffc..1d45582aff 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -55,22 +55,23 @@ endif
 pkginfo-clean: FORCE
 	-rm -f .pkginfo .config.in
 
-scripts/config/mconf: .config.in
+./scripts/config/mconf: .config.in
 	$(MAKE) -C scripts/config all
 
-scripts/config/conf: .config.in
+./scripts/config/conf: .config.in
 	$(MAKE) -C scripts/config conf
 
-config: scripts/config/conf FORCE
+config: ./scripts/config/conf FORCE
 	$< Config.in
 
-defdconfig: scripts/config/conf FORCE
-	$< -d Config.in
+defconfig: ./scripts/config/conf FORCE
+	touch .config
+	$< -D .config Config.in
 
-oldconfig: scripts/config/conf FORCE
+oldconfig: ./scripts/config/conf FORCE
 	$< -o Config.in
 
-menuconfig: scripts/config/mconf FORCE
+menuconfig: ./scripts/config/mconf FORCE
 	$< Config.in
 
 config-clean: FORCE
@@ -85,7 +86,9 @@ target/%: .pkginfo FORCE
 toolchain/%: FORCE
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
-world: FORCE
+world: ./scripts/config/conf FORCE
+	touch .config
+	$< -D .config Config.in >/dev/null 2>/dev/null
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile