From 65b426e4adb0d651e2ac1f3fffe4a5adec81e4fe Mon Sep 17 00:00:00 2001 From: Sudar Date: Thu, 25 Jul 2013 21:14:24 +0530 Subject: 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/chipKIT.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'arduino-mk/chipKIT.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),) -- cgit v1.2.3