Description: Set paths in mjo's Makefile to match Debian defaults
Author: Philip Hands <phil@hands.com>
Origin: vendor
Forwarded: not-needed

Index: arduino-mk/arduino-mk/Arduino.mk
===================================================================
--- arduino-mk.orig/arduino-mk/Arduino.mk	2013-08-08 09:32:33.707933670 -0400
+++ arduino-mk/arduino-mk/Arduino.mk	2013-08-08 09:34:07.147935891 -0400
@@ -50,12 +50,19 @@
 #   ARDUINO_DIR   = /Applications/Arduino.app/Contents/Resources/Java
 #   ARDMK_DIR     = /usr/local
 #
-# On Linux, you might prefer:
+# On Debian systems, you might prefer:
 #
 #   ARDUINO_DIR   = /usr/share/arduino
-#   ARDMK_DIR     = /usr/local
+#   ARDMK_DIR     = /usr
 #   AVR_TOOLS_DIR = /usr
 #
+# These are set up as defaults in this Debian version of this Makefile.
+# If your Makefile sets other values, they will override these defaults.
+# Additionally, a default for ARDUINO_PORT is set to
+# /dev/ttyACM* /dev/ttyUSB*
+# This means that on GNU/Linux system you shouldn't need to specify
+# the port in most cases.
+#
 # You can either set these up in the Makefile, or put them in your
 # environment e.g. in your .bashrc
 #
@@ -89,7 +96,7 @@
 #       BOARD_TAG    = uno
 #       ARDUINO_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:
 #
@@ -269,6 +276,12 @@
     $(call show_config_variable,ARDUINO_VERSION,[USER])
 endif
 
+# Set up defaults for Debian
+ARDUINO_DIR	?= /usr/share/arduino
+ARDMK_DIR	?= /usr
+AVR_TOOLS_DIR	?= /usr
+ARDUINO_PORT	?= /dev/ttyACM* /dev/ttyUSB*
+
 ########################################################################
 # Arduino and system paths
 #
