From 854a7aa8c03bd4bc5c5e9fc6fb5d6c46bf860472 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <rpavlik@iastate.edu> Date: Thu, 28 Jun 2012 18:28:22 -0500 Subject: [PATCH] Be able to autodetect ARDUINO_DIR in some cases --- arduino-mk/Arduino.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 5261afa..18a9860 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -263,6 +263,23 @@ # ######################################################################## +dir_if_exists = $(shell test -e $(1)$(2) && echo $(1) || true) + +ifndef ARDUINO_DIR +NIX_DEFAULT_ARDUINO_DIR := $(call dir_if_exists,/usr/share/arduino) +ifdef NIX_DEFAULT_ARDUINO_DIR +ARDUINO_DIR = $(NIX_DEFAULT_ARDUINO_DIR) +endif + +MAC_DEFAULT_ARDUINO_DIR := $(call dir_if_exists,/Applications/Arduino.app/Contents/Resources/Java) +ifdef MAC_DEFAULT_ARDUINO_DIR +ARDUINO_DIR = $(MAC_DEFAULT_ARDUINO_DIR) +endif + +ifdef ARDUINO_DIR +$(info Using autodetected ARDUINO_DIR '$(ARDUINO_DIR)') +endif +endif ######################################################################## # # Default TARGET to cwd (ex Daniele Vergini)