masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change to relative paths instead of absolute

This commit is contained in:
Jack Humbert 2016-06-12 15:55:05 -04:00
parent 42b40e6fde
commit 92759be322
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -4,19 +4,22 @@ endif
starting_makefile := $(abspath $(firstword $(MAKEFILE_LIST))) starting_makefile := $(abspath $(firstword $(MAKEFILE_LIST)))
mkfile_path := $(abspath $(lastword $(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))) 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))) ifneq (,$(findstring /keymaps/,$(possible_keyboard)))
KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard))) KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard)))
KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard))) KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard)))
tmk_root = ../../../..
else else
KEYBOARD_DIR:=$(possible_keyboard) KEYBOARD_DIR:=$(possible_keyboard)
KEYMAP_DIR:=default KEYMAP_DIR:=default
tmk_root = ../..
endif endif
else
tmk_root = .
endif endif
# $(info $(KEYBOARD_DIR)) # $(info $(KEYBOARD_DIR))
# $(info $(KEYMAP_DIR)) # $(info $(KEYMAP_DIR))