Fix whitespace issues
This commit is contained in:
parent
b29a0bed2a
commit
ad417dbf70
2 changed files with 8 additions and 8 deletions
|
@ -4,8 +4,8 @@ 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.
|
||||
|
||||
### 0.11.0 (in development)
|
||||
- Replace hardcoded executables with variable name
|
||||
|
||||
- Replace hardcoded executables with variable
|
||||
- Fix whitespace issues
|
||||
|
||||
### 0.10.6 (2013-06-14)
|
||||
- Fix whitespace and add /dev/null redirection (https://github.com/sej7278)
|
||||
|
|
|
@ -348,14 +348,14 @@ endif
|
|||
#
|
||||
ifndef ARDUINO_SKETCHBOOK
|
||||
ifneq ($(wildcard $(HOME)/.arduino/preferences.txt),)
|
||||
ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
|
||||
ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
|
||||
$(HOME)/.arduino/preferences.txt | \
|
||||
sed -e 's/sketchbook.path=//' )
|
||||
endif
|
||||
|
||||
# on mac
|
||||
# on mac
|
||||
ifneq ($(wildcard $(HOME)/Library/Arduino/preferences.txt),)
|
||||
ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
|
||||
ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
|
||||
$(HOME)/Library/Arduino/preferences.txt | \
|
||||
sed -e 's/sketchbook.path=//' )
|
||||
endif
|
||||
|
@ -413,9 +413,9 @@ ifndef BOARD_TAG
|
|||
BOARD_TAG = uno
|
||||
$(call show_config_variable,BOARD_TAG,[DEFAULT])
|
||||
else
|
||||
# Strip the board tag of any extra whitespace, since it was causing the makefile to fail
|
||||
# https://github.com/sudar/Arduino-Makefile/issues/57
|
||||
BOARD_TAG := $(strip $(BOARD_TAG))
|
||||
# Strip the board tag of any extra whitespace, since it was causing the makefile to fail
|
||||
# https://github.com/sudar/Arduino-Makefile/issues/57
|
||||
BOARD_TAG := $(strip $(BOARD_TAG))
|
||||
$(call show_config_variable,BOARD_TAG,[USER])
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue