From 92759be3226c83087959015be097b66d8c7e2f21 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 12 Jun 2016 15:55:05 -0400 Subject: change to relative paths instead of absolute --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 024a57134b..f8c945045c 100644 --- 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)) -- cgit v1.2.1