dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed the path of the bundled avrdude and avrdude.conf

Browse source
This commit is contained in:
guicho 2013-05-30 14:31:49 +09:00
parent e428e6fa74
commit 69be5fe9fd
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arduino-mk/Arduino.mk
View file

@ -406,8 +406,6 @@ ifdef ARDUINO_DIR
BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr)
ifdef BUNDLED_AVR_TOOLS_DIR ifdef BUNDLED_AVR_TOOLS_DIR
AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR) AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR)
# The avrdude bundled with Arduino can't find it's config
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/avrdude.conf
$(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution))
else else
@ -909,13 +907,13 @@ $(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS)
# Avrdude # Avrdude
# #
ifndef AVRDUDE ifndef AVRDUDE
AVRDUDE = $(AVR_TOOLS_PATH)/avrdude AVRDUDE = $(AVR_TOOLS_DIR)/../avrdude
endif endif
ifndef AVRDUDE_CONF ifndef AVRDUDE_CONF
ifndef AVR_TOOLS_DIR ifndef AVR_TOOLS_DIR
# The avrdude bundled with Arduino can't find its config # The avrdude bundled with Arduino can't find its config
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf
endif endif
# If avrdude is installed separately, it can find its own config flie # If avrdude is installed separately, it can find its own config flie
endif endif