diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-07-05 18:32:50 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-07-05 18:32:50 +0000 |
| commit | 50df5868ddc45c2e91a21aef9054c5ce742e2f54 (patch) | |
| tree | e84f76e23e9aae42654246cc65d1ebd73207e590 | |
| parent | 6c24630b39b83444356838a6e6c5f86b736ff5db (diff) | |
Fix LUFA_SRC_PLATFORM makefile variable in the SOURCES build module to use LUFA_ROOT_PATH rather than LUFA_PATH.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2383 d5102386-fcda-11dd-9fdb-3debd5008f28
| -rw-r--r-- | LUFA/Build/lufa.sources.in | 3 | ||||
| -rw-r--r-- | LUFA/makefile | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/LUFA/Build/lufa.sources.in b/LUFA/Build/lufa.sources.in index e3df528f..10e5c1d7 100644 --- 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 21f0f578..e8b7b7b9 100644 --- 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 |