diff options
| author | Simon John <git@the-jedi.co.uk> | 2014-12-03 22:38:50 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2014-12-03 22:38:50 +0000 |
| commit | 9c9491d1cc32d2751833182d30d265bd1b9126a9 (patch) | |
| tree | 48200236a6aa7edc617d47111a6af4c03afbd7fb | |
| parent | f946670f3dfdf4f262ce5e35d7b71c5c51a9ad9d (diff) | |
Moved location of avrdude and avrdude.conf for 1.5.8 on Linux (only!)
Subject to change during the beta phase, as its already different
than 1.5.6, also may change when packaged for Debian (usually symlinked)
Fixes issue #301
| -rw-r--r-- | Arduino.mk | 13 | ||||
| -rw-r--r-- | HISTORY.md | 1 |
2 files changed, 12 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 @@ -23,6 +23,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Tweak: Update travis-ci to test against Arduino 1.0.6. (https://github.com/sej7278) - Tweak: Updated package instructions for Arch/Fedora/Raspbian. (https://github.com/sej7278) - Tweak: Remove $(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas) +- Tweak: Moved location of avrdude for 1.5.8 on Linux (Issue #301) (https://github.com/sej7278) - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans) - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas) |