Эх сурвалжийг харах

Support for running from keyboard directory

Fred Sundvik 8 жил өмнө
parent
commit
c83af54513
1 өөрчлөгдсөн 3 нэмэгдсэн , 1 устгасан
  1. 3 1
      Makefile

+ 3 - 1
Makefile

@@ -1,6 +1,6 @@
 STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
 STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
 ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-ROOT_DIR := $(dir, $(ROOT_MAKEFILE))
+ROOT_DIR := $(dir $(ROOT_MAKEFILE))
 ifeq ($(ROOT_DIR),)
 ifeq ($(ROOT_DIR),)
     ROOT_DIR := .
     ROOT_DIR := .
 endif
 endif
@@ -104,6 +104,8 @@ define PARSE_RULE
         $$(eval $$(call PARSE_ALL_KEYBOARDS))
         $$(eval $$(call PARSE_ALL_KEYBOARDS))
     else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
     else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
         $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
         $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
+    else ifneq ($$(KEYBOARD),)
+        $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD)))
     else
     else
         $$(info make: *** No rule to make target '$1'. Stop.)
         $$(info make: *** No rule to make target '$1'. Stop.)
 		exit 1
 		exit 1