summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-28 11:02:58 +0000
committerQMK Bot <hello@qmk.fm>2021-07-28 11:02:58 +0000
commitaabbaf11aaf52207d2ba9870bd4b1d7dbfe51418 (patch)
tree8c4ae480d9ba8032dde8d8d6a7f53de9907919bc
parent4ef8ff458d7dcf49a288bb484323ab2098a21ef9 (diff)
parent491b83aa32e59be68387c25fcfa7bd6e7cb51479 (diff)
downloadqmk_firmware-aabbaf11aaf52207d2ba9870bd4b1d7dbfe51418.tar.gz
qmk_firmware-aabbaf11aaf52207d2ba9870bd4b1d7dbfe51418.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--Makefile19
1 files changed, 14 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 866bcaaf3f..bb2201e852 100644
--- a/Makefile
+++ b/Makefile
@@ -252,11 +252,20 @@ define PARSE_RULE
else
$$(info make: *** No rule to make target '$1'. Stop.)
$$(info |)
- $$(info | QMK's make format recently changed to use folder locations and colons:)
- $$(info | make project_folder:keymap[:target])
- $$(info | Examples:)
- $$(info | make dz60:default)
- $$(info | make planck/rev6:default:flash)
+ $$(info | QMK's make format is:)
+ $$(info | make keyboard_folder:keymap_folder[:target])
+ $$(info |)
+ $$(info | Where `keyboard_folder` is the path to the keyboard relative to)
+ $$(info | `qmk_firmware/keyboards/`, and `keymap_folder` is the name of the)
+ $$(info | keymap folder under that board's `keymaps/` directory.)
+ $$(info |)
+ $$(info | Examples:)
+ $$(info | keyboards/dz60, keyboards/dz60/keymaps/default)
+ $$(info | -> make dz60:default)
+ $$(info | -> qmk compile -kb dz60 -km default)
+ $$(info | keyboards/planck/rev6, keyboards/planck/keymaps/default)
+ $$(info | -> make planck/rev6:default:flash)
+ $$(info | -> qmk flash -kb planck/rev6 -km default)
$$(info |)
endif
endef