From 65b426e4adb0d651e2ac1f3fffe4a5adec81e4fe Mon Sep 17 00:00:00 2001
From: Sudar <sudar@sudarmuthu.com>
Date: Thu, 25 Jul 2013 21:14:24 +0530
Subject: [PATCH] Remove unnecessary checks for `ARDMK_DIR`

If `ARDMK_DIR` is not defined, then it is assumed to be the directory
where `Arduino.mk` or `chipKIT.mk` is present.

Since this assumption is made, `ARDMK_DIR` will always be set, whether
the user has explicitly set it or not. Therefore checking whether
`ARDMK_DIR` is not set is unnecessary. This commit removes these
unnecessary checks.
---
 arduino-mk/Arduino.mk | 12 ++++--------
 arduino-mk/chipKIT.mk |  8 ++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 17fb167..70b256c 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -225,15 +225,11 @@ else
     $(call show_config_variable,ARDMK_DIR,[USER])
 endif
 
-ifdef ARDMK_DIR
-    ifndef ARDMK_PATH
-        ARDMK_PATH = $(ARDMK_DIR)/bin
-        $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR))
-    else
-        $(call show_config_variable,ARDMK_PATH,[USER])
-    endif
+ifndef ARDMK_PATH
+    ARDMK_PATH = $(ARDMK_DIR)/bin
+    $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR))
 else
-    echo $(error "ARDMK_DIR is not defined")
+    $(call show_config_variable,ARDMK_PATH,[USER])
 endif
 
 ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),)
diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk
index 874b65e..8c98a1d 100644
--- a/arduino-mk/chipKIT.mk
+++ b/arduino-mk/chipKIT.mk
@@ -31,12 +31,8 @@ ifndef ARDMK_DIR
     ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..)
 endif
 
-ifdef ARDMK_DIR
-    ifndef ARDMK_PATH
-        ARDMK_PATH = $(ARDMK_DIR)/bin
-    endif
-else
-    echo $(error "ARDMK_DIR is not defined")
+ifndef ARDMK_PATH
+    ARDMK_PATH = $(ARDMK_DIR)/bin
 endif
 
 ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),)