diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-02 12:29:36 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-02 12:29:36 +0000 |
| commit | 59ca4ec0ec2376c3e94793ccb43487ecd036e1e7 (patch) | |
| tree | 9b9a33d85fd5f87574a71a771b05392d61f7fc3b /LUFA/Build | |
| parent | 7c75623e437ff0b9560a24dde5729c2f3b9ad57d (diff) | |
| download | lufa-59ca4ec0ec2376c3e94793ccb43487ecd036e1e7.tar.gz lufa-59ca4ec0ec2376c3e94793ccb43487ecd036e1e7.tar.bz2 lufa-59ca4ec0ec2376c3e94793ccb43487ecd036e1e7.zip | |
Strip trailing slash from the user-supplied LUFA_PATH directory, to prevent double slashes from appearing in the commands/output.
Diffstat (limited to 'LUFA/Build')
| -rw-r--r-- | LUFA/Build/lufa.build.in | 2 | ||||
| -rw-r--r-- | LUFA/Build/lufa.sources.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in index 2cdf667f3..4207f1707 100644 --- a/LUFA/Build/lufa.build.in +++ b/LUFA/Build/lufa.build.in @@ -104,7 +104,7 @@ else $(error Unsupported architecture.)
endif
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
ifneq ($(F_CPU),)
CC_FLAGS += -DF_CPU=$(F_CPU)UL
diff --git a/LUFA/Build/lufa.sources.in b/LUFA/Build/lufa.sources.in index ee74a48a0..9b7f6676a 100644 --- 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.)
# 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
LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c \
|