From 46deefe0f8bef203cec2798b8696d66e4800f1ea Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 6 Aug 2013 18:58:24 +0200
Subject: [PATCH] make Makefiles proof for spaces in $PATH

---
 Makefile.include           | 12 ++++++------
 cpu/Makefile               | 19 +++++++++----------
 cpu/cc430/Makefile         |  4 ++--
 cpu/mc1322x/Makefile       |  4 ++--
 cpu/msp430-common/Makefile |  4 ++--
 cpu/msp430x16x/Makefile    |  4 ++--
 cpu/native/Makefile        |  4 ++--
 drivers/Makefile           |  1 -
 drivers/at86rf231/Makefile |  4 ++--
 drivers/cc110x_ng/Makefile |  4 ++--
 drivers/cc2420/Makefile    |  4 ++--
 sys/Makefile               |  4 ++--
 12 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index 983297c637..292ba29667 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -45,9 +45,9 @@ endif
 ## make script for your project. Build RIOT-base here!
 all: $(PROJBINDIR)/$(PROJECT).a
 	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
-	$(MAKE) -C $(RIOTBOARD)
-	$(MAKE) -C $(RIOTBASE)
-	@for i in $(EXTERNAL_MODULES) ; do $(MAKE) -C $$i ; done ;
+	"$(MAKE)" -C $(RIOTBOARD)
+	"$(MAKE)" -C $(RIOTBASE)
+	@for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i ; done ;
 ifeq ($(BUILDOSXNATIVE),1)	
 	@$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie
 else
@@ -79,9 +79,9 @@ $(PROJBINDIR)/%.o: %.c $(PROJDEPS)
 	$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(PROJBINDIR)/$*.o
 
 clean:
-	$(MAKE) -C $(RIOTBOARD) clean
-	$(MAKE) -C $(RIOTBASE) clean
-	@for i in $(EXTERNAL_MODULES) ; do $(MAKE) -C $$i clean ; done ;
+	"$(MAKE)" -C $(RIOTBOARD) clean
+	"$(MAKE)" -C $(RIOTBASE) clean
+	@for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i clean ; done ;
 	rm -rf $(PROJBINDIR)
 
 flash: all
diff --git a/cpu/Makefile b/cpu/Makefile
index 88427b8e83..acca29a7db 100644
--- a/cpu/Makefile
+++ b/cpu/Makefile
@@ -24,15 +24,14 @@ endif
 cpus: $(DIRS)
 
 $(DIRS): 
-	@$(MAKE) -C $@
+	@"$(MAKE)" -C $@
 
 clean:
-	@$(MAKE) -C lpc2387 clean
-	@$(MAKE) -C mc1322x clean
-	@$(MAKE) -C lpc_common clean
-	@$(MAKE) -C arm_common clean
-	@$(MAKE) -C cc430 clean
-	@$(MAKE) -C msp430-common clean
-	@$(MAKE) -C msp430x16x clean
-	@$(MAKE) -C native clean
-
+	@"$(MAKE)" -C lpc2387 clean
+	@"$(MAKE)" -C mc1322x clean
+	@"$(MAKE)" -C lpc_common clean
+	@"$(MAKE)" -C arm_common clean
+	@"$(MAKE)" -C cc430 clean
+	@"$(MAKE)" -C msp430-common clean
+	@"$(MAKE)" -C msp430x16x clean
+	@"$(MAKE)" -C native clean
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index 52c5485470..7a82d0ad68 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -5,10 +5,10 @@ INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/mc1322x/Makefile b/cpu/mc1322x/Makefile
index 29e6928ccc..706aac84a5 100644
--- a/cpu/mc1322x/Makefile
+++ b/cpu/mc1322x/Makefile
@@ -9,10 +9,10 @@ ifneq (,$(findstring mc1322x_asm,$(USEMODULE)))
 endif
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/msp430-common/Makefile b/cpu/msp430-common/Makefile
index 6a87c63be9..0a92437f97 100644
--- a/cpu/msp430-common/Makefile
+++ b/cpu/msp430-common/Makefile
@@ -4,10 +4,10 @@ INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/includ
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/msp430x16x/Makefile b/cpu/msp430x16x/Makefile
index bfc3c1924f..421e3af303 100644
--- a/cpu/msp430x16x/Makefile
+++ b/cpu/msp430x16x/Makefile
@@ -4,10 +4,10 @@ INCLUDES = -I../include -I$(RIOTBASE)/core/include
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/native/Makefile b/cpu/native/Makefile
index 2c6f560a34..20840d66c5 100644
--- a/cpu/native/Makefile
+++ b/cpu/native/Makefile
@@ -10,10 +10,10 @@ ifneq (,$(findstring nativenet,$(USEMODULE)))
 endif
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/drivers/Makefile b/drivers/Makefile
index ec29c55335..d2f4914a21 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -48,4 +48,3 @@ clean::
 
 
 
-
diff --git a/drivers/at86rf231/Makefile b/drivers/at86rf231/Makefile
index 0f3fb7f2fb..eb4e520326 100644
--- a/drivers/at86rf231/Makefile
+++ b/drivers/at86rf231/Makefile
@@ -4,10 +4,10 @@ MODULE =at86rf231
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile
index d36acedc19..997aea9aea 100644
--- a/drivers/cc110x_ng/Makefile
+++ b/drivers/cc110x_ng/Makefile
@@ -16,10 +16,10 @@ ifneq (,$(findstring native,$(BOARD)))
 endif
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/drivers/cc2420/Makefile b/drivers/cc2420/Makefile
index 8eac6832bf..a672b373c2 100644
--- a/drivers/cc2420/Makefile
+++ b/drivers/cc2420/Makefile
@@ -4,10 +4,10 @@ MODULE =cc2420
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/sys/Makefile b/sys/Makefile
index 823092558b..a62c35f790 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -87,11 +87,11 @@ ifneq (,$(findstring hashes,$(USEMODULE)))
 endif
 
 all: $(BINDIR)$(MODULE).a 
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 # remove compilation products
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
-- 
GitLab