summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-07 18:30:58 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-08-20 03:56:21 +0300
commitc83af5451349e6160a2ee220e7b45bb974be5c64 (patch)
tree7a806a46cf00e41e53fd5326ea6b6e0a59446cc4
parent1ad5578d11b0b4a7288c3fd0748de3a57f4180f2 (diff)
downloadqmk_firmware-c83af5451349e6160a2ee220e7b45bb974be5c64.tar.gz
qmk_firmware-c83af5451349e6160a2ee220e7b45bb974be5c64.zip
Support for running from keyboard directory
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 623e4b064d..7180b41476 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-ROOT_DIR := $(dir, $(ROOT_MAKEFILE))
+ROOT_DIR := $(dir $(ROOT_MAKEFILE))
ifeq ($(ROOT_DIR),)
ROOT_DIR := .
endif
@@ -104,6 +104,8 @@ define PARSE_RULE
$$(eval $$(call PARSE_ALL_KEYBOARDS))
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
$$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
+ else ifneq ($$(KEYBOARD),)
+ $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD)))
else
$$(info make: *** No rule to make target '$1'. Stop.)
exit 1