X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=92a49bf9e81c9fe7abd8a56ebc34a80a3af85dd2;hb=913e6c00af52c2f3821885368653fc2696f8cba6;hp=84508b1ffcfb3adf40d8ba891b02672af5b3d2aa;hpb=767e9ba1f72b1a6975bbaa4d36b317e9b5dea5a2;p=openwrt.git

diff --git a/Makefile b/Makefile
index 84508b1ffc..92a49bf9e8 100644
--- a/Makefile
+++ b/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
@@ -95,11 +98,11 @@ world: FORCE
 clean: FORCE
 	rm -rf build_* bin
 
-dirclean: clean FORCE
+dirclean: clean
 	rm -rf staging_dir_* toolchain_build_*
 
-distclean: dirclean FORCE
-	rm -rf .* dl
+distclean: dirclean config-clean
+	rm -rf dl .*config* .pkg*
 
 .PHONY: FORCE
 FORCE: