Description: Minor tweaks for mjo's Makefile
Author: Philip Hands <phil@hands.com>
Origin: vendor
Forwarded: yes

Index: arduino-mk/arduino-mk/Arduino.mk
===================================================================
--- arduino-mk.orig/arduino-mk/Arduino.mk	2012-11-09 11:39:00.000000000 -0500
+++ arduino-mk/arduino-mk/Arduino.mk	2012-11-09 11:42:48.177726729 -0500
@@ -641,7 +641,7 @@
 AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)
 endif
 
-AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT)
+AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT) $(AVRDUDE_ARD_EXTRAOPTS)
 
 ifndef ISP_PROG
 ISP_PROG	   = -c stk500v2
@@ -683,10 +683,10 @@
 # least. Perhaps it would be better to just do it in perl ?
 reset_stty:		
 		for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
-		  do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
-		done ;\
-		$$STTYF $(ARD_PORT)  hupcl ;\
-		(sleep 0.1 || sleep 1)     ;\
+		  do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \
+		done ; \
+		$$STTYF $(ARD_PORT)  hupcl ; \
+		(sleep 0.1 2>/dev/null || sleep 1) ; \
 		$$STTYF $(ARD_PORT) -hupcl 
 
 ispload:	$(TARGET_HEX)
