Strip trailing slash from the user-supplied LUFA_PATH directory, to prevent double slashes from appearing in the commands/output.

pull/1469/head
Dean Camera 13 years ago
parent 7c75623e43
commit 59ca4ec0ec

@ -104,7 +104,7 @@ else
$(error Unsupported architecture.) $(error Unsupported architecture.)
endif endif
CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections
CC_FLAGS += -I. -I$(LUFA_PATH)/.. CC_FLAGS += -I. -I$(patsubst %/,%,$(LUFA_PATH))/..
CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL
ifneq ($(F_CPU),) ifneq ($(F_CPU),)
CC_FLAGS += -DF_CPU=$(F_CPU)UL CC_FLAGS += -DF_CPU=$(F_CPU)UL

@ -40,7 +40,7 @@ ARCH ?= $(error Makefile ARCH value not set.)
LUFA_PATH ?= $(error Makefile LUFA_PATH value not set.) LUFA_PATH ?= $(error Makefile LUFA_PATH value not set.)
# Allow LUFA_ROOT_PATH to be overridden elsewhere to support legacy LUFA makefiles # Allow LUFA_ROOT_PATH to be overridden elsewhere to support legacy LUFA makefiles
LUFA_ROOT_PATH ?= $(LUFA_PATH) LUFA_ROOT_PATH ?= $(patsubst %/,%,$(LUFA_PATH))
# Construct LUFA module source variables # Construct LUFA module source variables
LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c \ LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c \

Loading…
Cancel
Save