From 049a6880c1bc7d49e1e84872c0967a9f3a7204b3 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Fri, 19 Dec 2014 17:30:51 +0100 Subject: [PATCH] make: change escaped quotation marks The '""' pattern is used so that the variable can be processed as a string after the preprocessors evaluation. Change to \"\" instead, so that single quotes can be used externally. The extra quotation marks are unneeded. Related to #2213 --- Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.include b/Makefile.include index 11f488851a..f9c8305145 100644 --- a/Makefile.include +++ b/Makefile.include @@ -105,9 +105,9 @@ endif BOARDDEF := $(shell echo $(BOARD) | tr 'a-z' 'A-Z' | tr '-' '_') CPUDEF := $(shell echo $(CPU) | tr 'a-z' 'A-Z' | tr '-' '_') MCUDEF := $(shell echo $(MCU) | tr 'a-z' 'A-Z' | tr '-' '_') -CFLAGS += -DBOARD_$(BOARDDEF)='"$(BOARD)"' -DRIOT_BOARD=BOARD_$(BOARDDEF) -CFLAGS += -DCPU_$(CPUDEF)='"$(CPU)"' -DRIOT_CPU=CPU_$(CPUDEF) -CFLAGS += -DMCU_$(MCUDEF)='"$(MCU)"' -DRIOT_MCU=MCU_$(MCUDEF) +CFLAGS += -DBOARD_$(BOARDDEF)=\"$(BOARD)\" -DRIOT_BOARD=BOARD_$(BOARDDEF) +CFLAGS += -DCPU_$(CPUDEF)=\"$(CPU)\" -DRIOT_CPU=CPU_$(CPUDEF) +CFLAGS += -DMCU_$(MCUDEF)=\"$(MCU)\" -DRIOT_MCU=MCU_$(MCUDEF) # OSX fails to create empty archives. Provide a wrapper to catch that error. ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) -rc $(BINDIR)empty-archive.a 2> /dev/null; echo $$?)) @@ -131,7 +131,7 @@ ifeq ($(origin RIOT_VERSION), undefined) RIOT_VERSION := UNKNOWN (builddir: $(RIOTBASE)) endif endif -export CFLAGS += -DRIOT_VERSION='"$(RIOT_VERSION)"' +export CFLAGS += -DRIOT_VERSION=\"$(RIOT_VERSION)\" # the binaries to link BASELIBS += $(BINDIR)$(BOARD)_base.a