From bebe3b5ebbfb93636bbc877769f05ca6b7f6f0d7 Mon Sep 17 00:00:00 2001 From: Chase Lambert Date: Mon, 7 Sep 2015 17:35:54 -0700 Subject: [PATCH] AVRDUDE_CONF gets set when not in windows Relating to sudar/Arduino-Makefile#381 --- Arduino.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Arduino.mk b/Arduino.mk index ba16697..3362a7a 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -452,10 +452,8 @@ else # Check in Windows as Cygwin is being used, that the configuration file for the AVRDUDE is set # Check if it works on MAC - ifeq ($(CURRENT_OS),WINDOWS) - ifndef AVRDUDE_CONF - AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf - endif + ifndef AVRDUDE_CONF + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf endif endif #ndef AVR_TOOLS_DIR