From 904fe1fbd10388f384c9930fa2d8a25113b7e7aa Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 2 Oct 2010 14:28:08 +0000 Subject: [PATCH] Makefile: fix config-devices.mak generation The logic of detecting changes in default-configs/*.mak is flawed as can be demonstrated by 'touch default-configs/*.mak' followed by make. This results in a message claiming that user made changes to the */config-devices.mak files. Fix by separating the detection of changes made by the user and changes in the default-configs. Signed-off-by: Blue Swirl --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fca1e7a51f..7c71c83a18 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,11 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) %/config-devices.mak: default-configs/%.mak $(call quiet-command,cat $< > $@.tmp, " GEN $@") @if test -f $@; then \ - if cmp -s $@.old $@ || cmp -s $@ $@.tmp; then \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ + if cmp -s $@.old $@; then \ + if ! cmp -s $@ $@.tmp; then \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ + fi; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ -- 2.11.0