Remove redundant checks for ARDUINO_DIR

HISTORY.md

@@ -9,6 +9,7 @@ The following is the rough list of changes that went into different versions. I
 - Add support for reseting "Micro" Arduino. Fix issue #80 (https://github.com/sej7278)
 - Remove "utility" from example makefiles. Fix issue #84
 - Auto detect alternate core path from sketchbook folder. Fix issue #86
+- Remove redundant checks for ARDUINO_DIR
 
 ### 0.12.0 (2013-06-20)
 - Fix "generated_assembly" target, which got broken earlier. Fix issue #76 (https://github.com/matthijskooijman)

arduino-mk/Arduino.mk

@@ -238,8 +238,9 @@ ifndef ARDUINO_DIR
     ifdef AUTO_ARDUINO_DIR
        ARDUINO_DIR = $(AUTO_ARDUINO_DIR)
        $(call show_config_variable,ARDUINO_DIR,[AUTODETECTED])
+    else
+        echo $(error "ARDUINO_DIR is not defined")
     endif
-
 else
     $(call show_config_variable,ARDUINO_DIR,[USER])
 endif
@@ -300,8 +301,6 @@ endif
 ########################################################################
 # Arduino and system paths
 #
-ifdef ARDUINO_DIR
-
 ifndef AVR_TOOLS_DIR
 
     BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr)
@@ -374,10 +373,6 @@ ifdef ARDUINO_DIR
 
 endif
 
-else
-    echo $(error "ARDUINO_DIR is not defined")
-endif
-
 ifdef AVR_TOOLS_DIR
     ifndef AVR_TOOLS_PATH
         AVR_TOOLS_PATH    = $(AVR_TOOLS_DIR)/bin