dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #90 from ralfdoering/opensuse

Browse source 
Documention and fixes for openSUSE and system provided avrdude
This commit is contained in:
Sudar 2013-06-25 22:29:09 -07:00
commit a7d5563698
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -33,6 +33,11 @@ On Fedora:
yum install perl-Device-SerialPort yum install perl-Device-SerialPort
yum install perl-YAML yum install perl-YAML
On openSUSE:
zypper install perl-Device-SerialPort
zypper install perl-YAML
On Mac using MacPorts: On Mac using MacPorts:
sudo port install p5-device-serialport sudo port install p5-device-serialport
@ -54,6 +59,13 @@ standard location for custom libraries when using the Arduino IDE), you need to
set the `ARDUINO_SKETCHBOOK` variable to point to this directory. By default it set the `ARDUINO_SKETCHBOOK` variable to point to this directory. By default it
is set to `$HOME/sketchbook`. is set to `$HOME/sketchbook`.
## avrdude
To upload compiled files, `avrdude` is used. This Makefile tries to find `avrdude` and it's config (`avrdude.conf`) below `ARDUINO_DIR`. If you like to use the one installed on your system instead of the one which came with Arduino, you can try to set the variables `AVRDUDE` and `AVRDUDE_CONF`. On a typical Linux system these could be set to
AVRDDUDE = /usr/bin/avrdude
AVRDUDE_CONF = /etc/avrdude.conf
## Versioning ## Versioning
The current version of the makefile is `0.12.0`. You can find the full history in the [HISTORY.md](HISTORY.md) file The current version of the makefile is `0.12.0`. You can find the full history in the [HISTORY.md](HISTORY.md) file

4
arduino-mk/Arduino.mk
View file

@ -306,10 +306,12 @@ 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 ifdef BUNDLED_AVR_TOOLS_DIR
AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR) AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR)
# if AVRDUDE_CONF is already defined, don't overwrite it
ifndef AVRDUDE_CONF
# The avrdude bundled with Arduino can't find it's config # The avrdude bundled with Arduino can't find it's config
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
$(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution))
endif
else else
SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which avr-gcc))/..)) SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which avr-gcc))/..))