From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 7 Apr 2007 13:30:57 +0000 (+0000)
Subject: make a few commands silent and fix defconfig logic
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=df77a68e7069ead3bc854373ec2ded1075dc486d

make a few commands silent and fix defconfig logic

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6886 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/Makefile b/Makefile
index 3596bcd84a..e2d5c1450f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,20 +50,18 @@ target/%/Makefile: ;
 tmp/.packageinfo: FORCE
 tmp/.targetinfo: FORCE
 tmp/.%info:
-	mkdir -p tmp/info
-	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA=""
+	@mkdir -p tmp/info
+	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA=""
 
 tmpinfo-clean: FORCE
 	-rm -rf tmp/.*info
 
 tmp/.config-%.in: tmp/.%info
-	./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
-
-
+	@./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
 .config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
-	if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
-		cp $(HOME)/.openwrt/defconfig .config; \
+	if [ \! -f .config ]; then \
+		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
 		$(NO_TRACE_MAKE) menuconfig; \
 	fi
 	$< -D .config Config.in &> /dev/null