dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify finding arduino dir

Browse source
This commit is contained in:
Ryan Pavlik 2012-07-05 14:39:32 -05:00
parent 744cb5350d
commit 940a6b6ecc
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arduino-mk/Arduino.mk
View file

@ -266,17 +266,11 @@ $(call show_separator)
$(info Arduino.mk Configuration:) $(info Arduino.mk Configuration:)
ifndef ARDUINO_DIR ifndef ARDUINO_DIR
NIX_DEFAULT_ARDUINO_DIR := $(call dir_if_exists,/usr/share/arduino) AUTO_ARDUINO_DIR := $(firstword \
ifdef NIX_DEFAULT_ARDUINO_DIR $(call dir_if_exists,/usr/share/arduino) \
ARDUINO_DIR = $(NIX_DEFAULT_ARDUINO_DIR) $(call dir_if_exists,/Applications/Arduino.app/Contents/Resources/Java) )
endif ifdef AUTO_ARDUINO_DIR
ARDUINO_DIR = $(AUTO_ARDUINO_DIR)
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
$(call show_config_info,ARDUINO_DIR,[AUTODETECTED]) $(call show_config_info,ARDUINO_DIR,[AUTODETECTED])
endif endif