diff options
| author | Sudar <sudar@sudarmuthu.com> | 2014-12-04 10:31:15 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-12-04 10:31:15 +0530 |
| commit | e18132e269dd07e996d323ef5aa9dc77504f5cf4 (patch) | |
| tree | 48200236a6aa7edc617d47111a6af4c03afbd7fb /Arduino.mk | |
| parent | f946670f3dfdf4f262ce5e35d7b71c5c51a9ad9d (diff) | |
| parent | 9c9491d1cc32d2751833182d30d265bd1b9126a9 (diff) | |
Merge pull request #302 from sej7278/master
Moved location of avrdude and avrdude.conf for 1.5.8 on Linux (only!)
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -403,11 +403,20 @@ ifndef AVR_TOOLS_DIR ifeq ($(CURRENT_OS),LINUX) ifndef AVRDUDE - AVRDUDE = $(AVR_TOOLS_DIR)/../avrdude + ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1) + # 1.5.8 has different location than all prior versions! + AVRDUDE = $(AVR_TOOLS_DIR)/bin/avrdude + else + AVRDUDE = $(AVR_TOOLS_DIR)/../avrdude + endif endif ifndef AVRDUDE_CONF - AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf + ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1) + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf + else + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf + endif endif else |