kata: Step 2: Rename out pathnames to match

Change-Id: I65bb98334084148a9bb057c960199b177bf43fc7
diff --git a/Makefile b/Makefile
index b5c73e8..968a89c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-SRC_LIBSEL4 ?= $(ROOTDIR)/kata/kernel/libsel4
-OUT_KATA    ?= $(OUT)/kata/riscv32-unknown-elf/release
+SRC_LIBSEL4 ?= $(ROOTDIR)/cantrip/kernel/libsel4
+OUT_CANTRIP ?= $(OUT)/cantrip/riscv32-unknown-elf/release
 OUT_MINISEL ?= $(OUT)/tmp/minisel
 
 INCLUDES += -I$(SRC_LIBSEL4)/arch_include/riscv
 INCLUDES += -I$(SRC_LIBSEL4)/include
 INCLUDES += -I$(SRC_LIBSEL4)/mode_include/32
 INCLUDES += -I$(SRC_LIBSEL4)/sel4_arch_include/riscv32/
-INCLUDES += -I$(OUT_KATA)/kernel/gen_config
-INCLUDES += -I$(OUT_KATA)/libsel4/autoconf
-INCLUDES += -I$(OUT_KATA)/libsel4/gen_config/
-INCLUDES += -I$(OUT_KATA)/libsel4/include
-INCLUDES += -I$(OUT_KATA)/libsel4/sel4_arch_include/riscv32
+INCLUDES += -I$(OUT_CANTRIP)/kernel/gen_config
+INCLUDES += -I$(OUT_CANTRIP)/libsel4/autoconf
+INCLUDES += -I$(OUT_CANTRIP)/libsel4/gen_config/
+INCLUDES += -I$(OUT_CANTRIP)/libsel4/include
+INCLUDES += -I$(OUT_CANTRIP)/libsel4/sel4_arch_include/riscv32
 
 OPT=-O0
 DBG=-g