/make/arduino-mk

To get this branch, use:
bzr branch http://bzr.ed.am/make/arduino-mk

« back to all changes in this revision

Viewing changes to arduino.mk

  • Committer: edam
  • Date: 2013-01-10 22:32:17 UTC
  • Revision ID: tim@ed.am-20130110223217-oyqk3raaa8gp006s
typo

Show diffs side-by-side

added added

removed removed

arduino.mk
155
155
 
156
156
# default arduino software directory, check software exists
157
157
ifndef ARDUINODIR
158
 
ARDUINODIR := $(firstword $(wildcard ~/opt/arduino /usr/share/arduino \
159
 
        /Applications/Arduino.app/Contents/Resources/Java \
160
 
        $(HOME)/Applications/Arduino.app/Contents/Resources/Java))
 
158
ARDUINODIR := $(firstword $(wildcard ~/opt/arduino /usr/share/arduino))
161
159
endif
162
160
ifeq "$(wildcard $(ARDUINODIR)/hardware/arduino/boards.txt)" ""
163
161
$(error ARDUINODIR is not set correctly; arduino software not found)
209
207
BOARD_BOOTLOADER_FILE := $(call readboardsparam,bootloader.file)
210
208
 
211
209
# obtain preferences from the IDE's preferences.txt
212
 
PREFERENCESFILE := $(firstword $(wildcard \
213
 
        $(HOME)/.arduino/preferences.txt $(HOME)/Library/Arduino/preferences.txt))
 
210
PREFERENCESFILE := $(wildcard $(HOME)/.arduino/preferences.txt)
214
211
ifneq "$(PREFERENCESFILE)" ""
215
212
readpreferencesparam = $(shell sed -ne "s/$(1)=\(.*\)/\1/p" $(PREFERENCESFILE))
216
213
SKETCHBOOKDIR := $(call readpreferencesparam,sketchbook.path)