fix make distclean

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 6fd4a53..20da69a 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -44,19 +44,19 @@ prepare-tmpinfo: FORCE
        ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
        touch $(TOPDIR)/tmp/.build
 
-.config: ./scripts/config/conf prepare-tmpinfo
-       @+if [ \! -f .config ]; then \
+.config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)
+       @+if [ \! -f .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                $(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
        fi
 
 scripts/config/mconf:
-       @$(_SINGLE)$(SUBMAKE) -s -j1 -C scripts/config all
+       @$(SUBMAKE) -s -j1 -C scripts/config all
 
 $(eval $(call rdep,scripts/config,scripts/config/mconf))
 
 scripts/config/conf:
-       @$(_SINGLE)$(SUBMAKE) -s -j1 -C scripts/config conf
+       @$(SUBMAKE) -s -j1 -C scripts/config conf
 
 config: scripts/config/conf prepare-tmpinfo FORCE
        $< Config.in
@@ -86,7 +86,7 @@ kernel_menuconfig: .config FORCE
 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp
        rm -f tmp/.host.mk
-       @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
+       @$(NO_TRACE_MAKE) -j1 -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
@@ -113,10 +113,10 @@ help:
        cat README
 
 docs docs/compile: FORCE
-       @$(_SINGLE)$(SUBMAKE) -j1 -C docs compile
+       @$(SUBMAKE) -j1 -C docs compile
 
 docs/clean: FORCE
-       @$(_SINGLE)$(SUBMAKE) -j1 -C docs clean
+       @$(SUBMAKE) -j1 -C docs clean
 
 distclean:
        rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/openwrt-packages bin