summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-03 14:28:03 +0000
committerQMK Bot <hello@qmk.fm>2022-03-03 14:28:03 +0000
commit8a5ad2a11366ec62f231b34263406ee71a516388 (patch)
tree58ba8adac3457195dd54b728eea954a693269205
parent9f95844cad8215f5cc5a90844e4b99fb1518286f (diff)
parent75b40dc7a537e7f223a73c165a3f6f0e2e91817c (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/helix/rev2/local_features.mk2
-rw-r--r--keyboards/helix/rev2/override_helix_options.mk8
2 files changed, 6 insertions, 4 deletions
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 1484312064..cfff8fd64d 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -6,7 +6,7 @@
#
KEYBOARD_LOCAL_FEATURES_MK :=
--include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
+-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
# Parse 'HELIX=xx,yy,zz' option
ifneq ($(strip $(HELIX)),)
diff --git a/keyboards/helix/rev2/override_helix_options.mk b/keyboards/helix/rev2/override_helix_options.mk
index a6d3331e80..56dee8ce78 100644
--- a/keyboards/helix/rev2/override_helix_options.mk
+++ b/keyboards/helix/rev2/override_helix_options.mk
@@ -1,6 +1,8 @@
-$(info -------------------------)
-$(info override_helix_options.mk)
-$(info -------------------------)
+ifneq ($(strip $(HELIX)),)
+ $(info -------------------------)
+ $(info override_helix_options.mk)
+ $(info -------------------------)
+endif
define HELIX_OVERRIDE_PARSE
ifeq ($(strip $1),back)