aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-02-19 08:48:46 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-02-27 19:42:45 +0100
commit12ccfec9684679fc1945b5b5020487b2cb17dc06 (patch)
treee55c16828e7fd6af45fc38ca29421ebb33530e8a
parent23cab7b7a9cb365b15eee953a0dd6cdb9198ae6c (diff)
Makefile: don't silence mak file test with V=1
V=1 should show what's going on, it's not nice to silence things unconditionally. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-Id: <1424332114-13440-1-git-send-email-mst@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--Makefile6
-rw-r--r--scripts/make_device_config.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b0d8c07cec..d92d4cd573 100644
--- a/Makefile
+++ b/Makefile
@@ -109,8 +109,8 @@ endif
-include $(SUBDIR_DEVICES_MAK_DEP)
%/config-devices.mak: default-configs/%.mak
- $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
- @if test -f $@; then \
+ $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, " GEN $@.tmp")
+ $(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \
mv $@.tmp $@; \
cp -p $@ $@.old; \
@@ -126,7 +126,7 @@ endif
else \
mv $@.tmp $@; \
cp -p $@ $@.old; \
- fi
+ fi, " GEN $@");
defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 7242707819..7958086132 100644
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -2,7 +2,7 @@
# Construct a target device config file from a default, pulling in any
# files from include directives.
-dest=$1.tmp
+dest=$1
dep=`dirname $1`-`basename $1`.d
src=$2
src_dir=`dirname $src`