diff options
| author | jeffkowalski <jeff.kowalski@gmail.com> | 2012-08-18 20:30:25 -0700 |
|---|---|---|
| committer | jeffkowalski <jeff.kowalski@gmail.com> | 2012-08-18 20:30:25 -0700 |
| commit | 486be238badbc36fb0859be068f2c8e99b892ffa (patch) | |
| tree | 2f31d7dadc55f6ea17e9e68f28c21eb3762d8d0c | |
| parent | d09a316d7ae990bdfbd3630a289b27f2dfeb5ec3 (diff) | |
Added autodetection of ARDMK_DIR
| -rw-r--r-- | arduino-mk/Arduino.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index e08fd62..113d569 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -384,23 +384,26 @@ endif ######################################################################## # Makefile distribution path # -ifdef ARDMK_DIR - $(call show_config_variable,ARDMK_DIR) +ifndef ARDMK_DIR + # presume it's a level above the path to our own file + ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..) + $(call show_config_variable,ARDMK_DIR,[COMPUTED],(relative to $(notdir $(lastword $(MAKEFILE_LIST))))) +else + $(call show_config_variable,ARDMK_DIR,[USER]) +endif +ifdef ARDMK_DIR ifndef ARDMK_PATH ARDMK_PATH = $(ARDMK_DIR)/bin $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR)) - else $(call show_config_variable,ARDMK_PATH) endif - else - echo $(error "ARDMK_DIR is not defined") - endif + ######################################################################## # Miscellanea # @@ -574,7 +577,6 @@ endif ######################################################################## # Determine ARDUINO_LIBS automatically # - ifndef ARDUINO_LIBS # automatically determine included libraries ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \ |