summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2009-11-19 20:19:56 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-03 15:25:59 -0600
commit01d86a8544e9c8dd1cf12f66ce850db365c38f25 (patch)
tree6e7a6f78bd8b23e1e3a4b4c62773e20ee345db3d
parent7ebf54bca173c1e5b970f9462436b2c151309220 (diff)
downloadqemu-01d86a8544e9c8dd1cf12f66ce850db365c38f25.tar.gz
Fix build for mingw32 on windows ($$ expansion)
Make using mingw32 on windows fails when running grep "=y$$". The command is expanded to grep "=y$ and the missing " results in an error. I don't expect a file config-devices.mak with =y somewhere in the middle of a line (they are always at the end of the line), so simplifying the regular expression to =y seems to be permitted. This avoids problems with wrong expansion. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b8b5e2e934..85ad68846b 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
- $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep "=y$$" | sort -u > $@," GEN $@")
+ $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@," GEN $@")
%/config-devices.mak: default-configs/%.mak
$(call quiet-command,cat $< > $@.tmp, " GEN $@")