From 9395817c96766004fa01d062c2cdaca659852a17 Mon Sep 17 00:00:00 2001
From: Martin Oldfield <m@mjo.tc>
Date: Mon, 17 Sep 2012 16:38:46 +0100
Subject: [PATCH] Only set AVRDUDE_CONF if it's not set, as per Tom Hall's
 patch

---
 arduino-mk/Arduino.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index dc8aa6c..f12637d 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -285,9 +285,11 @@ 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
+# The avrdude bundled with Arduino can't find its config
+ifndef AVRDUDE_CONF
 AVRDUDE_CONF	  = $(AVR_TOOLS_DIR)/etc/avrdude.conf
 endif
+endif
 
 ifndef AVR_TOOLS_PATH
 AVR_TOOLS_PATH    = $(AVR_TOOLS_DIR)/bin