diff options
| author | Ryan Pavlik <rpavlik@iastate.edu> | 2012-07-05 14:39:32 -0500 |
|---|---|---|
| committer | Ryan Pavlik <rpavlik@iastate.edu> | 2012-07-05 14:39:32 -0500 |
| commit | 940a6b6ecca5af82fc2363027fde2be41642f33e (patch) | |
| tree | 365f712755d526d0680f556bf3a0f9db706da0e2 | |
| parent | 744cb5350d5a80d4368d7a22e4a9ec1e7c9fb408 (diff) | |
Simplify finding arduino dir
| -rw-r--r-- | arduino-mk/Arduino.mk | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 39e5697..0118855 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -266,17 +266,11 @@ $(call show_separator) $(info Arduino.mk Configuration:) 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 + 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_info,ARDUINO_DIR,[AUTODETECTED]) endif |