Fix LUFA_SRC_PLATFORM makefile variable in the SOURCES build module to use LUFA_ROOT_...

diff --git a/LUFA/Build/lufa.sources.in b/LUFA/Build/lufa.sources.in
index e3df528..10e5c1d 100644 (file)
--- a/LUFA/Build/lufa.sources.in
+++ b/LUFA/Build/lufa.sources.in
@@ -101,7 +101,8 @@ LUFA_SRC_SERIAL      := $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(AR
 LUFA_SRC_TWI         := $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c
 
 ifeq ($(ARCH), UC3)
-   LUFA_SRC_PLATFORM := $(LUFA_PATH)/Platform/UC3/Exception.S $(LUFA_PATH)/Platform/UC3/InterruptManagement.c
+   LUFA_SRC_PLATFORM := $(LUFA_ROOT_PATH)/Platform/UC3/Exception.S   \
+                        $(LUFA_ROOT_PATH)/Platform/UC3/InterruptManagement.c
 else
    LUFA_SRC_PLATFORM :=
 endif

diff --git a/LUFA/makefile b/LUFA/makefile
index 21f0f57..e8b7b7b 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -25,9 +25,9 @@ version:
 
 # Check if this is being included from a legacy or non LUFA build system makefile
 ifneq ($(LUFA_PATH),)
-  LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA/
+  LUFA_ROOT_PATH = $(patsubst %/,%,$(LUFA_PATH))/LUFA/
   
-  include $(LUFA_PATH)/LUFA/Build/lufa.sources.in
+  include $(patsubst %/,%,$(LUFA_PATH))/LUFA/Build/lufa.sources.in
 else
   LUFA_BUILD_MODULES     += MASTER
   LUFA_BUILD_TARGETS     += export_tar version