diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-06-25 22:29:09 -0700 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-06-25 22:29:09 -0700 |
| commit | a7d55636986452c1cb51ff70fed6cea7fab8d949 (patch) | |
| tree | 537477a2501097cdfa6f591cebfcf2b81f07a3f2 /arduino-mk/Arduino.mk | |
| parent | fb1fac8a86517f482b4520bccf0bb36ca61d1317 (diff) | |
| parent | d8b52bdd3424249d1b7a3d2928047efefa4d7b72 (diff) | |
Merge pull request #90 from ralfdoering/opensuse
Documention and fixes for openSUSE and system provided avrdude
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index b217592..aaec9aa 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -306,10 +306,12 @@ ifndef AVR_TOOLS_DIR BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) ifdef 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)/etc/avrdude.conf - $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) - + # if AVRDUDE_CONF is already defined, don't overwrite it + ifndef AVRDUDE_CONF + # The avrdude bundled with Arduino can't find it's config + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf + $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) + endif else SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which avr-gcc))/..)) |