From 1e5d7c1a33955e70275f8f7e828498c98995590e Mon Sep 17 00:00:00 2001 From: Adam Dunlap Date: Sun, 10 Jun 2012 14:40:31 -0700 Subject: [PATCH 1/2] Changed echo command to work on linux --- arduino-mk/Arduino.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 315492f..a091b2b 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -478,7 +478,7 @@ NM = $(AVR_TOOLS_PATH)/avr-nm REMOVE = rm -f MV = mv -f CAT = cat -ECHO = echo +ECHO = echo -e # General arguments SYS_LIBS = $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(ARDUINO_LIBS)) From 4a81c19a8beaf8c2b20b3b7d7f1ba78da8b5ecb9 Mon Sep 17 00:00:00 2001 From: Adam Dunlap Date: Sun, 10 Jun 2012 15:06:08 -0700 Subject: [PATCH 2/2] Changed AVRDUDE_CONF so it can be defined in per-project makefile --- arduino-mk/Arduino.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index a091b2b..0ea464b 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -285,8 +285,6 @@ ifdef ARDUINO_DIR ifndef AVR_TOOLS_DIR AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/tools/avr -# The avrdude bundled with Arduino can't find it's config -AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf endif ifndef AVR_TOOLS_PATH @@ -612,6 +610,14 @@ ifndef AVRDUDE AVRDUDE = $(AVR_TOOLS_PATH)/avrdude endif +ifndef AVRDUDE_CONF +ifndef AVR_TOOLS_DIR +# The avrdude bundled with Arduino can't find its config +AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf +endif +# If avrdude is installed separately, it can find its own config flie +endif + AVRDUDE_COM_OPTS = -q -V -p $(MCU) ifdef AVRDUDE_CONF AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)