diff options
| -rw-r--r-- | HISTORY.md | 1 | ||||
| -rw-r--r-- | arduino-mk/Arduino.mk | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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 - In ISP mode, read baudrate and programmer from boards.txt. See #125 - Add `burn_bootloader` target. See #85 +- Show correct path to `arduino.mk` file in help message. Fix #120 ### 1.0.1 (2013-09-25) - Unconditionally add -D in avrdude options. See #114 diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 9fcb613..3ecfbb5 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -241,10 +241,12 @@ endif ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),) # git checkout + ARDMK_FILE = $(ARDMK_DIR)/arduino-mk/arduino.mk include $(ARDMK_DIR)/arduino-mk/Common.mk else ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) # package install + ARDMK_FILE = $(ARDMK_DIR)/arduino.mk include $(ARDMK_DIR)/Common.mk endif endif @@ -1190,7 +1192,7 @@ help: make burn_bootloader - Burn bootloader and/or fuses\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 \ clean depends size show_boards monitor disasm symbol_sizes generated_assembly \ |