diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-12-09 05:47:19 -0800 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-12-09 05:47:19 -0800 |
| commit | 25a00d73b704d9d0af0f971587b3e39016e395e0 (patch) | |
| tree | ed457d5561cbd9e4ac44d7e8c16b97d9fac2ff42 | |
| parent | 24128a1819e679c65c832452b53d6a075d74ce7d (diff) | |
| parent | bc03025596bbef5a4ed2d6de9b1c518ee1325501 (diff) | |
Merge pull request #137 from peplin/chipkit-avrdude-mac
Adjust path to avrdude/avrdude.conf for MPIDE in Linux.
| -rw-r--r-- | arduino-mk/chipKIT.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk index fd7a0d2..2d9abb4 100644 --- a/arduino-mk/chipKIT.mk +++ b/arduino-mk/chipKIT.mk @@ -72,9 +72,17 @@ endif AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools -AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools -AVRDUDE = $(AVRDUDE_DIR)/avrdude -AVRDUDE_CONF = $(AVRDUDE_DIR)/avrdude.conf +# The same as in Arduino, the Linux distribution contains avrdude and +# avrdude.conf in a different location. +ifeq ($(CURRENT_OS),LINUX) + AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools + AVRDUDE = $(AVRDUDE_DIR)/avrdude + AVRDUDE_CONF = $(AVRDUDE_DIR)/avrdude.conf +else + AVRDUDE_DIR = $(ARDUINO_DIR)/hardware/tools/avr + AVRDUDE = $(AVRDUDE_DIR)/bin/avrdude + AVRDUDE_CONF = $(AVRDUDE_DIR)/etc/avrdude.conf +endif ALTERNATE_CORE = pic32 ALTERNATE_CORE_PATH = $(MPIDE_DIR)/hardware/pic32 |