Merge pull request #161 from sej7278/master

BUNDLED_AVR_TOOLS_DIR is now set correctly

Author: sudar

Arduino.mk

@@ -354,7 +354,7 @@ endif
 
 ifndef AVR_TOOLS_DIR
 
-    BUNDLED_AVR_TOOLS_DIR ?= $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr)
+    BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr)
 
     ifdef BUNDLED_AVR_TOOLS_DIR
         AVR_TOOLS_DIR     = $(BUNDLED_AVR_TOOLS_DIR)

HISTORY.md

@@ -4,6 +4,9 @@ A Makefile for Arduino Sketches
 The following is the rough list of changes that went into different versions.
 I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
 
+### 1.3.1 (2014-02-01)
+- Fix: BUNDLED_AVR_TOOLS_DIR is now set properly when using only arduino-core and not the whole arduino package. (https://github.com/sej7278)
+
 ### 1.3.0 (2014-01-29)
 - Fix: Use more reliable serial device naming in Windows. Fix issue #139 and #155 (https://github.com/peplin)
 - Fix: Document that ARDUINO_DIR must be a relative path in Windows. Fix issue #156 (https://github.com/peplin)

README.md

@@ -119,7 +119,7 @@ It is possible to use [`colorgcc`](https://github.com/colorgcc/colorgcc) with th
 
 ## Versioning
 
-The current version of the makefile is `1.3.0`. You can find the full history in the [HISTORY.md](HISTORY.md) file
+The current version of the makefile is `1.3.1`. You can find the full history in the [HISTORY.md](HISTORY.md) file
 
 This project adheres to Semantic [Versioning 2.0](http://semver.org/).
 

packaging/fedora/README.md

@@ -6,15 +6,15 @@ First install the dependencies as root:
 
 From the top-level Arduino-Makefile directory you've checked out of github, run the following (as unprivileged user) to create a compressed tarball using the naming conventions required by rpmbuild:
 
-    git archive HEAD --prefix=arduino-mk-1.3.0/ -o ../arduino-mk-1.3.0.tar.gz
+    git archive HEAD --prefix=arduino-mk-1.3.1/ -o ../arduino-mk-1.3.1.tar.gz
 
 If you don't already have a rpmbuild setup (e.g. you've not installed the SRPM) you will need to create the directories:
 
     mkdir -p ~/rpmbuild/{SOURCES,SPECS}
 
 Then copy the tarball and specfile into those directories:
 
-    cp ../arduino-mk-1.3.0.tar.gz ~/rpmbuild/SOURCES/
+    cp ../arduino-mk-1.3.1.tar.gz ~/rpmbuild/SOURCES/
     cp packaging/fedora/arduino-mk.spec ~/rpmbuild/SPECS/
 
 Then compile. This will create a binary and source RPM:

packaging/fedora/arduino-mk.spec

@@ -1,5 +1,5 @@
 Name:			arduino-mk
-Version:		1.3.0
+Version:		1.3.1
 Release:		1%{dist}
 Summary:		Program your Arduino from the command line
 Packager:		Simon John <[email protected]>
@@ -51,6 +51,8 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}/examples
 
 %changelog
+* Sat Feb 01 2014 Simon John <[email protected]>
+- Updated version.
 * Mon Jan 13 2014 Simon John <[email protected]>
 - Removed arduino-mk subdirectory
 * Mon Dec 30 2013 Simon John <[email protected]>