Merge pull request #390 from thomaskilian/master

Correct path ARDUINO_DIR for Macs

Merged and thanks for the PR @thomaskilian 

4 files changed, 15 insertions, 3 deletions

diff --git a/Arduino.mk b/Arduino.mk
index 561793d..eb94a3c 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -45,11 +45,16 @@
 # that things are canonically arranged beneath the directories defined
 # above.
 #
-# On the Mac you might want to set:
+# On the Mac with IDE 1.0 you might want to set:
 #
 #   ARDUINO_DIR   = /Applications/Arduino.app/Contents/Resources/Java
 #   ARDMK_DIR     = /usr/local
 #
+# On the Mac with IDE 1.5+ you might want to set:
+#
+#   ARDUINO_DIR   = /Applications/Arduino.app/Contents/Java
+#   ARDMK_DIR     = /usr/local
+#
 # On Linux, you might prefer:
 #
 #   ARDUINO_DIR   = /usr/share/arduino
diff --git a/HISTORY.md b/HISTORY.md
index 2ce6142..4ccf650 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -20,6 +20,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - Fix: Make sure TARGET is set correctly when CURDIR contains spaces (https://github.com/svendahlstrand)
 - Fix: Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is, not just on Windows (Issue #381) (https://github.com/sej7278)
 - Fix: Rename VENDOR to ARDMK_VENDOR to workaround tcsh issue (Issue #386) (https://github.com/sej7278)
+- Fix: Document OSX 1.0/1.6 ARDUINO_DIR differences (https://github.com/thomaskilian)
 
 ### 1.5 (2015-04-07)
 - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)
diff --git a/README.md b/README.md
index 120d1da..948cf8b 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ whilst [Blink](examples/Blink/Makefile) demonstrates the minimal settings requir
 
 Download a copy of this repo some where in your system or install it through a package.
 
-On the Mac you might want to set:
+On the Mac with IDE 1.0 you might want to set:
 
 ```make
     ARDUINO_DIR   = /Applications/Arduino.app/Contents/Resources/Java
@@ -144,6 +144,12 @@ On the Mac you might want to set:
     BOARD_TAG     = mega2560
 ```
 
+On the Mac with IDE 1.5+ it's like above but with
+
+```
+    ARDUINO_DIR   = /Applications/Arduino.app/Contents/Java
+```
+
 On Linux (if you have installed through package), you shouldn't need to set anything other than your board type and port:
 
 ```make
diff --git a/examples/MakefileExample/Makefile-example.mk b/examples/MakefileExample/Makefile-example.mk
index d9411d1..34c080f 100644
--- a/examples/MakefileExample/Makefile-example.mk
+++ b/examples/MakefileExample/Makefile-example.mk
@@ -15,7 +15,7 @@ ARDMK_DIR         = $(PROJECT_DIR)/Arduino-Makefile
 ### ARDUINO_DIR
 ### Path to the Arduino application and resources directory.
 ### On OS X:
-ARDUINO_DIR       = /Applications/Arduino.app/Contents/Resources/Java
+ARDUINO_DIR       = /Applications/Arduino.app/Contents/Java
 ### or on Linux: (remove the one you don't want)
 ARDUINO_DIR       = /usr/share/arduino