diff options
| author | Martin Oldfield <m@mjo.tc> | 2012-09-17 16:38:46 +0100 |
|---|---|---|
| committer | Martin Oldfield <m@mjo.tc> | 2012-09-17 16:38:46 +0100 |
| commit | 9395817c96766004fa01d062c2cdaca659852a17 (patch) | |
| tree | 956f349830da6be6871d99c65556e7d5aa435156 /arduino-mk | |
| parent | c02da764aca6b6553d7d9b5d9dbdb6f4148e5cb6 (diff) | |
Only set AVRDUDE_CONF if it's not set, as per Tom Hall's patch
Diffstat (limited to 'arduino-mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index dc8aa6c..f12637d 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -285,9 +285,11 @@ ifdef ARDUINO_DIR ifndef AVR_TOOLS_DIR AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/tools/avr -# The avrdude bundled with Arduino can't find it's config +# The avrdude bundled with Arduino can't find its config +ifndef AVRDUDE_CONF AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf endif +endif ifndef AVR_TOOLS_PATH AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin |