From d4e0a383ae6ad13615e1c82a48646886cf175d2f Mon Sep 17 00:00:00 2001
From: Simon John <git@the-jedi.co.uk>
Date: Mon, 13 Jan 2014 12:14:31 +0000
Subject: Simplify package vs git checkout detection

Fix #147
Fix #151
Fix #153

The following are the detailed changes

- Remove ARDMK_PATH, ARDMK_FILE and arduino-mk subdirectory
- Looks for ard-reset-arduino in $PATH or ARDMK_DIR/bin
- Fix git-archive command in RPM SPEC file
- Remove some whitespace
- Remove arduino-mk dir from debian package's arduino-mk.install
- Update docs to reflect the above changes
- Bump Up version to 1.2.0
---
 chipKIT.mk | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'chipKIT.mk')

diff --git a/chipKIT.mk b/chipKIT.mk
index 2d9abb4..f3ac4cb 100644
--- a/chipKIT.mk
+++ b/chipKIT.mk
@@ -27,23 +27,11 @@
 # The show_config_variable is unavailable before we include the common makefile,
 # so we defer logging the ARDMK_DIR info until it happens in Arduino.mk
 ifndef ARDMK_DIR
-    # presume it's a level above the path to our own file
-    ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..)
+    # presume it's the same path to our own file
+    ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
 endif
 
-ifndef ARDMK_PATH
-    ARDMK_PATH = $(ARDMK_DIR)/bin
-endif
-
-ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),)
-    # git checkout
-    include $(ARDMK_DIR)/arduino-mk/Common.mk
-else
-    ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) 
-        # package install
-        include $(ARDMK_DIR)/Common.mk
-    endif
-endif
+include $(ARDMK_DIR)/Common.mk
 
 ifndef MPIDE_DIR
     AUTO_MPIDE_DIR := $(firstword \
@@ -110,4 +98,4 @@ LDFLAGS  += -T$(ARDUINO_CORE_PATH)/chipKIT-application-COMMON.ld
 CPPFLAGS += -mno-smart-io -fno-short-double
 CFLAGS_STD =
 
-include $(ARDMK_DIR)/arduino-mk/Arduino.mk
+include $(ARDMK_DIR)/Arduino.mk
-- 
cgit v1.2.3