From aca513de9b347a7b07b8d287816865bb76c874c4 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Fri, 13 Nov 2020 22:55:33 -0800
Subject: [PATCH] Do a slightly better job looking for the included makefile

---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 13dda8d9..7af58c58 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,13 @@ endif
 # the hardware directory can be determined in relation to the position of 
 # this Makefile.
 
+KALEIDOSCOPE_ETC_DIR ?= $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope/etc/
 
 ifeq ("$(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk","")
    # Determine the path of this Makefile
-   MKFILE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-endif
+   KALEIDOSCOPE_ETC_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/etc
 
-KALEIDOSCOPE_ETC_DIR ?= $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope/etc/
+endif
 
 include $(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk
 
@@ -37,8 +37,6 @@ ifneq ($(TEST_PATH),)
  TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'"
 endif
 
-
-
 clean:
 	$(MAKE) -C tests clean
 	rm -rf testing/googletest/build/*