[gnoduino: 166/237] Explicitly set the SHELL variable when OS=windows, so that we'll use the same shell regardless of wh

[Lucian Langa <lucilanga src gnome org>]

commit 9c1e9afe8112c13b7204cd5f3b6422fd5ac4400c
Author: WestfW <westfw gmail com>
Date:   Wed Oct 5 01:41:03 2011 -0700

    Explicitly set the SHELL variable when OS=windows, so that we'll use
    the same shell regardless of whether other shells are installed
    (different shells have different behavior WRT directory component
    separators, so this matters.
    
    http://code.google.com/p/arduino/issues/detail?id=667 )
    (cherry picked from commit fc8cacb9a3b7c1d9cf96ae9891c7c3cd21f3c181)

 arduino/bootloaders/optiboot/Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/arduino/bootloaders/optiboot/Makefile b/arduino/bootloaders/optiboot/Makefile
index c2e03e3..b9f3ed5 100644
--- a/arduino/bootloaders/optiboot/Makefile
+++ b/arduino/bootloaders/optiboot/Makefile
@@ -57,8 +57,10 @@ AVRDUDE_CONF = -C$(TOOLROOT)/avr/etc/avrdude.conf
 ifeq ($(OS), windows)
 # On windows, SOME of the tool paths will need to have backslashes instead
 # of forward slashes (because they use windows cmd.exe for execution instead
-# of a unix/mingw shell?)
+# of a unix/mingw shell?)  We also have to ensure that a consistent shell
+# is used even if a unix shell is installed (ie as part of WINAVR)
 fixpath = $(subst /,\,$1)
+SHELL = cmd.exe
 endif
 
 else ifeq ($(ENV), arduinodev)