From 3fd0e2e6a7592abdf30b82139a77d5a2201a8d63 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Fri, 6 May 2016 22:30:23 +0100
Subject: [PATCH] Fix up config generation to be safe with spaces

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fe2e09e94..dde9d8cb3 100644
--- a/Makefile
+++ b/Makefile
@@ -496,8 +496,10 @@ build-info: | $(BUILD_DIR)
 #
 ##############################
 
-CONFIG_OPTS := $(addsuffix \n,$(MAKEOVERRIDES))
-CONFIG_OPTS := $(addprefix override$(SPACE),$(CONFIG_OPTS))
+CONFIG_OPTS := $(subst \$(SPACE),%SPACE_PLACEHOLDER%,$(MAKEOVERRIDES))
+CONFIG_OPTS := $(addprefix override%SPACE_PLACEHOLDER%,$(CONFIG_OPTS))
+CONFIG_OPTS := $(subst $(SPACE),\n,$(CONFIG_OPTS))\n
+CONFIG_OPTS := $(subst %SPACE_PLACEHOLDER%,$(SPACE),$(CONFIG_OPTS))
 
 .PHONY: config_new
 config_new: