aboutsummaryrefslogtreecommitdiff
path: root/chipKIT.mk
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2014-03-10 12:50:06 -0400
committerSudar <sudar@sudarmuthu.com>2014-03-11 09:51:01 +0530
commitf1a79dbb3f6a5d06e9d6ddbacc8d6a378dcaec47 (patch)
treeb796f58d92c33f3978df719802a96bb1d0d28ebe /chipKIT.mk
parenta06136aafcf9bacbff679971db02762e65a6ce2d (diff)
Fix AVR tools paths for chipKIT in Linux.
Fix #175 Fix #174
Diffstat (limited to 'chipKIT.mk')
-rw-r--r--chipKIT.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/chipKIT.mk b/chipKIT.mk
index 1adfda2..19a4a4a 100644
--- a/chipKIT.mk
+++ b/chipKIT.mk
@@ -57,8 +57,13 @@ ifndef MPIDE_PREFERENCES_PATH
endif
endif
+# The same as in Arduino, the Linux distribution contains avrdude and #
+# avrdude.conf in a different location, but for chipKIT it's even slightly
+# different than the Linux paths for Arduino, so we have to "double override".
ifeq ($(CURRENT_OS),LINUX)
- BUNDLED_AVR_TOOLS_DIR = $(call dir_if_exists,$(MPIDE_DIR)/hardware/tools)
+ AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools
+ AVRDUDE = $(AVRDUDE_DIR)/avrdude
+ AVRDUDE_CONF = $(AVRDUDE_DIR)/avrdude.conf
endif
PIC32_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools