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

Show correct path to arduino.mk file in help message

Browse source 
Fix #120
This commit is contained in:
Sudar 2013-10-06 19:20:52 +05:30
parent 4fb3e089bb
commit 51f1271b32
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
HISTORY.md
View file

@ -9,6 +9,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Ignore commented lines while parsing boards.txt file. See #124 - Ignore commented lines while parsing boards.txt file. See #124
- In ISP mode, read baudrate and programmer from boards.txt. See #125 - In ISP mode, read baudrate and programmer from boards.txt. See #125
- Add `burn_bootloader` target. See #85 - Add `burn_bootloader` target. See #85
- Show correct path to `arduino.mk` file in help message. Fix #120
### 1.0.1 (2013-09-25) ### 1.0.1 (2013-09-25)
- Unconditionally add -D in avrdude options. See #114 - Unconditionally add -D in avrdude options. See #114

4
arduino-mk/Arduino.mk
View file

@ -241,10 +241,12 @@ endif
ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),) ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),)
# git checkout # git checkout
ARDMK_FILE = $(ARDMK_DIR)/arduino-mk/arduino.mk
include $(ARDMK_DIR)/arduino-mk/Common.mk include $(ARDMK_DIR)/arduino-mk/Common.mk
else else
ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),)
# package install # package install
ARDMK_FILE = $(ARDMK_DIR)/arduino.mk
include $(ARDMK_DIR)/Common.mk include $(ARDMK_DIR)/Common.mk
endif endif
endif endif
@ -1190,7 +1192,7 @@ help:
make burn_bootloader - Burn bootloader and/or fuses\n\ make burn_bootloader - Burn bootloader and/or fuses\n\
make help - show this help\n\ make help - show this help\n\
" "
@$(ECHO) "Please refer to $(ARDMK_DIR)/arduino-mk/Arduino.mk for more details." @$(ECHO) "Please refer to $(ARDMK_FILE) for more details."
.PHONY: all upload raw_upload raw_eeprom error_on_caterina reset reset_stty ispload \ .PHONY: all upload raw_upload raw_eeprom error_on_caterina reset reset_stty ispload \
clean depends size show_boards monitor disasm symbol_sizes generated_assembly \ clean depends size show_boards monitor disasm symbol_sizes generated_assembly \