-CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/ \\r
- $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/\r
-CPPCHECK_PATH = $(LUFA_ROOT_PATH)\r
+CPPCHECK_INCLUDES = $(patsubst %/,%,$(LUFA_PATH))/CodeTemplates/ \\r
+ $(patsubst %/,%,$(LUFA_PATH))/../Projects/AVRISP-MKII/\r
+CPPCHECK_PATH = $(patsubst %/,%,$(LUFA_PATH))/..\r