From 6534cf8f15e64df55bb98576e43fb46855bdbd2a Mon Sep 17 00:00:00 2001
From: stepcut <jeremy@n-heptane.com>
Date: Wed, 22 Oct 2014 15:27:59 -0500
Subject: move ARDUINO_DIR auto-detection into Common.mk. This allows Teensy.mk
 to use auto-detected location.

---
 Common.mk | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'Common.mk')

diff --git a/Common.mk b/Common.mk
index 0c1bc0b..b77c644 100644
--- a/Common.mk
+++ b/Common.mk
@@ -45,6 +45,29 @@ else
 endif
 $(call show_config_variable,CURRENT_OS,[AUTODETECTED])
 
+########################################################################
+# Arduino Directory
+
+ifndef ARDUINO_DIR
+    AUTO_ARDUINO_DIR := $(firstword \
+        $(call dir_if_exists,/usr/share/arduino) \
+        $(call dir_if_exists,/Applications/Arduino.app/Contents/Resources/Java) )
+    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
+
+ifeq ($(CURRENT_OS),WINDOWS)
+    ifneq ($(shell echo $(ARDUINO_DIR) | egrep '^(/|[a-zA-Z]:\\)'),)
+        echo $(error On Windows, ARDUINO_DIR must be a relative path)
+    endif
+endif
+
 ########################################################################
 #
 # Travis-CI
-- 
cgit v1.2.3