From bf4177567623dee3e274e59162afa4b2bacedaf5 Mon Sep 17 00:00:00 2001 From: Sudar Date: Sat, 29 Jun 2013 16:43:52 +0530 Subject: [PATCH] Print config info about AVR_TOOLS_DIR always In 25a31afbd92f03a1df1b50e3620f40afedd2e67e a bug was introduced which prevented the config info for AVR_TOOLS_DIR to be printed when AVRDUDE_CONF was defined. This commit moves the config printing statement for AVR_TOOLS_DIR outside the condition which checks whether AVRDUDE_CONF is defined. --- arduino-mk/Arduino.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index aaec9aa..16f7d66 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -306,11 +306,12 @@ ifndef AVR_TOOLS_DIR BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) ifdef BUNDLED_AVR_TOOLS_DIR AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR) + $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) + # if AVRDUDE_CONF is already defined, don't overwrite it ifndef AVRDUDE_CONF # The avrdude bundled with Arduino can't find it's config AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf - $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) endif else