Skip to content

Commit adf09c1

Browse files
authored
Merge pull request #1 from sudar/master
Merge from original sudar repository
2 parents 7bb2701 + a1fbda0 commit adf09c1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Common.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ else
5757
endif
5858
ifeq ($(UNAME_S),Darwin)
5959
CURRENT_OS = MAC
60-
ifeq (, $(shell which ggrep))
61-
echo $(info Using macOS BSD grep, please install GNU grep to avoid warnings)
60+
ifeq (, $(shell which gggrep))
61+
$(info Using macOS BSD grep, please install GNU grep to avoid warnings)
6262
GREP_CMD = grep
6363
else
6464
GREP_CMD = ggrep

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ The makefile can autodetect the libraries that are included from your sketch and
298298

299299
## avrdude
300300

301-
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
301+
To upload compiled files, `avrdude` is used. This Makefile tries to find `avrdude` and its 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
302302

303303
```make
304304
AVRDUDE = /usr/bin/avrdude

0 commit comments

Comments
 (0)