fix annoying make parse error

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 84508b1..92a49bf 100644 (file)
--- 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: