Merge branch 'master' of https://github.com/sudar/Arduino-Makefile

README.md

@@ -42,7 +42,7 @@ need the `YAML` library to run ard-parse-boards.
 
 On Debian or Ubuntu:
 
-       apt-get install libdevice-serial-perl
+       apt-get install libdevice-serialport-perl
        apt-get install libyaml-perl
 
 On Fedora:
@@ -129,6 +129,7 @@ The following are the list of changes that I have made or merged in this fork. H
 - Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech)
 - Changed shebang to use /usr/bin/env (https://github.com/anm)
 - set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr)
+- Updated Readme (https://github.com/fr0sty1/)
 
 ## Know Issues
 - Because of the way the makefile is structured, the configuration parameters gets printed twice. 

arduino-mk/Arduino.mk

@@ -478,6 +478,14 @@ ifndef ARDUINO_SKETCHBOOK
                                           $(HOME)/.arduino/preferences.txt | \
                                      sed -e 's/sketchbook.path=//' )
     endif
+
+	# on mac
+    ifneq ($(wildcard $(HOME)/Library/Arduino/preferences.txt),)
+	ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
+                                          $(HOME)/Library/Arduino/preferences.txt | \
+                                     sed -e 's/sketchbook.path=//' )
+    endif
+
     ifneq ($(ARDUINO_SKETCHBOOK),)
         $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(in arduino preferences file))
     else
@@ -503,8 +511,8 @@ endif
 # for more information (search for 'character special device').
 #
 ifndef MONITOR_BAUDRATE
-        #This works only in linux. TODO: Port it to MAC OS also
-	SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' )
+	#This works only in linux. TODO: Port it to MAC OS also
+	SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' )
 	MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)
 
 	ifeq ($(MONITOR_BAUDRATE),)