aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2013-10-06 19:20:52 +0530
committerSudar <sudar@sudarmuthu.com>2013-10-06 19:20:52 +0530
commit51f1271b3228e088b21e0a1144f042718308ca14 (patch)
tree27a9c0bcf80ce168c72e23f30d10219dd1de798c
parent4fb3e089bb6b649a28e2c42277283fcfe2b094da (diff)
Show correct path to `arduino.mk` file in help message
Fix #120
-rw-r--r--HISTORY.md1
-rw-r--r--arduino-mk/Arduino.mk4
2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 4ddbbe5..33547df 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -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 \