diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-07-11 21:10:40 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-07-12 16:07:49 +0530 |
| commit | 290a4986d6e8dcbc0fcb03c4135eed911b28765f (patch) | |
| tree | 268339bf6d453034533b1f48fb05a206ec9e954f | |
| parent | 588f7028b2db75d08d2f468f5c5d7c7a4a1e8253 (diff) | |
Make `ARDMK_PATH` and `ARDMK_DIR` backward compatible
When support for ChipKit was added recently (issue #98) it broke the way
ARDMK_PATH and ARDMK_DIR were handled, if the package was installed
through package. It was only working if you have done a git checkout.
This commit fixes it, but searching for `Common.mk` both in
`ARDMK_DIR/arduino-mk` and `ARDMK_DIR/` directories.
Fix #110
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | arduino-mk/Arduino.mk | 14 | ||||
| -rw-r--r-- | arduino-mk/chipKIT.mk | 10 |
3 files changed, 21 insertions, 5 deletions
@@ -18,7 +18,7 @@ On the Mac you might want to set: On Linux, you might prefer: ARDUINO_DIR = /usr/share/arduino - ARDMK_DIR = /usr/local + ARDMK_DIR = /usr AVR_TOOLS_DIR = /usr The Makefile also delegates resetting the board to a short Perl program. diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index b0fb653..17fb167 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -53,7 +53,7 @@ # On Linux, you might prefer: # # ARDUINO_DIR = /usr/share/arduino -# ARDMK_DIR = /usr/local +# ARDMK_DIR = /usr # AVR_TOOLS_DIR = /usr # # You can either set these up in the Makefile, or put them in your @@ -88,7 +88,7 @@ # BOARD_TAG = uno # MONITOR_PORT = /dev/cu.usb* # -# include /usr/local/share/Arduino.mk +# include /usr/share/arduino/Arduino.mk # # Hopefully these will be self-explanatory but in case they're not: # @@ -236,7 +236,15 @@ else echo $(error "ARDMK_DIR is not defined") endif -include $(ARDMK_DIR)/arduino-mk/Common.mk +ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),) + # git checkout + include $(ARDMK_DIR)/arduino-mk/Common.mk +else + ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) + # package install + include $(ARDMK_DIR)/Common.mk + endif +endif ######################################################################## # diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk index ffcdf1b..874b65e 100644 --- a/arduino-mk/chipKIT.mk +++ b/arduino-mk/chipKIT.mk @@ -39,7 +39,15 @@ else echo $(error "ARDMK_DIR is not defined") endif -include $(ARDMK_DIR)/arduino-mk/Common.mk +ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),) + # git checkout + include $(ARDMK_DIR)/arduino-mk/Common.mk +else + ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) + # package install + include $(ARDMK_DIR)/Common.mk + endif +endif ifndef MPIDE_DIR AUTO_MPIDE_DIR := $(firstword \ |