include/toplevel.mk: fix defconfig when ~/.openwrt/defconfig exists

./scripts/feeds update will reset the .config file if ~/.openwrt/defconfig
exists, thus resetting the target to ar71xx.

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 581083d912dee3a9acdb9c159bd0613bada91f11..3844f3cfc1414ebf7a1a33c8725e99071c3bcb5b 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -110,7 +110,7 @@ config-clean: FORCE
 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
        touch .config
-       @if [ -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi
+       @if [  -s .config -a -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi
        $< --defconfig=.config Config.in
 
 confdefault-y=allyes