]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
change to relative paths instead of absolute
authorJack Humbert <jack.humb@gmail.com>
Sun, 12 Jun 2016 19:55:05 +0000 (15:55 -0400)
committerJack Humbert <jack.humb@gmail.com>
Sun, 12 Jun 2016 19:55:05 +0000 (15:55 -0400)
Makefile

index 024a57134b5c1ce078738c7d1cec1455b93dad4f..f8c945045c3e574ae3bdc3af381d6f44d9212c3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,19 +4,22 @@ endif
 
 starting_makefile := $(abspath $(firstword $(MAKEFILE_LIST)))
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
-tmk_root := $(patsubst %/,%,$(dir $(mkfile_path)))
+abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path)))
 
 ifneq (,$(findstring /keyboard/,$(starting_makefile)))
-       possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(tmk_root)/keyboard/%,%,$(starting_makefile))))
+       possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboard/%,%,$(starting_makefile))))
        ifneq (,$(findstring /keymaps/,$(possible_keyboard)))
                KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard)))
                KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard)))
+               tmk_root = ../../../..
        else
                KEYBOARD_DIR:=$(possible_keyboard)
                KEYMAP_DIR:=default
+               tmk_root = ../..
        endif
+else
+       tmk_root = .
 endif
-
 # $(info $(KEYBOARD_DIR))
 # $(info $(KEYMAP_DIR))