diff options
| author | zvecr | 2025-12-01 23:07:33 +0100 |
|---|---|---|
| committer | zvecr | 2025-12-01 23:07:33 +0100 |
| commit | b315b707e60f86d79d34bcb7a15084468117c1a1 (patch) | |
| tree | 7bbdc5f5d703c28310b4751dd3db280d8f55a6bd /builddefs/build_layout.mk | |
| parent | e2bf515df4c51c4d2e3b442d23e52d6d43f7f726 (diff) | |
| parent | e10429baae2a4b3ffec67fe31a5e1ac3212817f0 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'builddefs/build_layout.mk')
| -rw-r--r-- | builddefs/build_layout.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builddefs/build_layout.mk b/builddefs/build_layout.mk index 9ff99cc221..7a5dbf58b6 100644 --- a/builddefs/build_layout.mk +++ b/builddefs/build_layout.mk @@ -10,10 +10,10 @@ define SEARCH_LAYOUTS_REPO LAYOUT_KEYMAP_JSON := $$(LAYOUT_KEYMAP_PATH)/keymap.json LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_JSON))","") - -include $$(LAYOUT_KEYMAP_PATH)/rules.mk KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON) - KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH) - else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","") + KEYMAP_JSON_PATH := $$(LAYOUT_KEYMAP_PATH) + endif + ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","") -include $$(LAYOUT_KEYMAP_PATH)/rules.mk KEYMAP_C := $$(LAYOUT_KEYMAP_C) KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH) |