From 290a4986d6e8dcbc0fcb03c4135eed911b28765f Mon Sep 17 00:00:00 2001
From: Sudar <sudar@sudarmuthu.com>
Date: Thu, 11 Jul 2013 21:10:40 +0530
Subject: 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
---
 arduino-mk/Arduino.mk | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'arduino-mk/Arduino.mk')

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
 
 ########################################################################
 #
-- 
cgit v1.2.3