Strip trailing slash from the user-supplied LUFA_PATH directory, to prevent double...

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index 2cdf667..4207f17 100644 (file)
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -104,7 +104,7 @@ else
   $(error Unsupported architecture.)\r
 endif\r
 CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections\r
   $(error Unsupported architecture.)\r
 endif\r
 CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections\r

-CC_FLAGS += -I. -I$(LUFA_PATH)/..\r
+CC_FLAGS += -I. -I$(patsubst %/,%,$(LUFA_PATH))/..\r

 CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL\r
 ifneq ($(F_CPU),)\r
    CC_FLAGS += -DF_CPU=$(F_CPU)UL\r
 CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL\r
 ifneq ($(F_CPU),)\r
    CC_FLAGS += -DF_CPU=$(F_CPU)UL\r

diff --git a/LUFA/Build/lufa.sources.in b/LUFA/Build/lufa.sources.in
index ee74a48..9b7f667 100644 (file)
--- a/LUFA/Build/lufa.sources.in
+++ b/LUFA/Build/lufa.sources.in
@@ -40,7 +40,7 @@ ARCH           ?= $(error Makefile ARCH value not set.)
 LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)\r
 \r
 # Allow LUFA_ROOT_PATH to be overridden elsewhere to support legacy LUFA makefiles\r
 LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)\r
 \r
 # Allow LUFA_ROOT_PATH to be overridden elsewhere to support legacy LUFA makefiles\r

-LUFA_ROOT_PATH ?= $(LUFA_PATH)\r
+LUFA_ROOT_PATH ?= $(patsubst %/,%,$(LUFA_PATH))\r

 \r
 # Construct LUFA module source variables\r
 LUFA_SRC_USB         = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \\r
 \r
 # Construct LUFA module source variables\r
 LUFA_SRC_USB         = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \\r