From 9c9491d1cc32d2751833182d30d265bd1b9126a9 Mon Sep 17 00:00:00 2001 From: Simon John Date: Wed, 3 Dec 2014 22:38:50 +0000 Subject: 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 --- Arduino.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index 74c28c1..1e17109 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -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 -- cgit v1.2.3