diff options
| author | Sudar <sudar@sudarmuthu.com> | 2012-06-10 22:24:31 -0700 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2012-06-10 22:24:31 -0700 |
| commit | 8140557eb29d8c42092cec85df0c1da794dd5863 (patch) | |
| tree | 47c742d0a03e93cad7dc773a23d276518c142920 | |
| parent | af52a2dcc8c0119eca135cf1c5f66276a8efd5d5 (diff) | |
| parent | 4a81c19a8beaf8c2b20b3b7d7f1ba78da8b5ecb9 (diff) | |
Merge pull request #1 from WizenedEE/master
Add more flexibility and make echo work on linux and changed AVRDUDE_CONF so that it can be defined in per-project makefile.
| -rw-r--r-- | arduino-mk/Arduino.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 315492f..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 @@ -478,7 +476,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)) @@ -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) |