Fixed typo montana-montara and updated p4c output

Change-Id: I76b4e1edb7cdb7de9927b806ef7e093782ac4078
diff --git a/pipelines/fabric-pro/src/main/resources/Makefile b/pipelines/fabric-pro/src/main/resources/Makefile
index 585c0d2..5942baa 100644
--- a/pipelines/fabric-pro/src/main/resources/Makefile
+++ b/pipelines/fabric-pro/src/main/resources/Makefile
@@ -1,10 +1,10 @@
 P4_SRC_DIR=$(ONOS_ROOT)/pipelines/fabric/src/main/resources
 
 MAVERICKS_CPU_PORT=320
-MONTANA_CPU_PORT=192
+MONTARA_CPU_PORT=192
 
 MAVERICKS_OPTIONS=-DCPU_PORT=$(MAVERICKS_CPU_PORT)
-MONTANA_OPTIONS=-DCPU_PORT=$(MONTANA_CPU_PORT)
+MONTARA_OPTIONS=-DCPU_PORT=$(MONTARA_CPU_PORT)
 
 all: fabric-tofino fabric-spgw-tofino
 
@@ -16,8 +16,8 @@
 		--p4runtime-format text main.p4
 	p4c -x p4-16 -b tofino-v1model-barefoot \
 		-I $(P4_SRC_DIR) \
-		$(MONTANA_OPTIONS) -o p4c-out/tofino/fabric/montana \
-		--p4runtime-file p4c-out/tofino/fabric/montana/fabric.p4info \
+		$(MONTARA_OPTIONS) -o p4c-out/tofino/fabric/montara \
+		--p4runtime-file p4c-out/tofino/fabric/montara/fabric.p4info \
 		--p4runtime-format text main.p4
 
 fabric-spgw-tofino:
@@ -28,8 +28,8 @@
 		--p4runtime-format text main.p4
 	p4c -x p4-16 -b tofino-v1model-barefoot \
 		-I $(P4_SRC_DIR) \
-		$(MONTANA_OPTIONS) -DWITH_SPGW -o p4c-out/tofino/fabric-spgw/montana \
-		--p4runtime-file p4c-out/tofino/fabric-spgw/montana/fabric.p4info \
+		$(MONTARA_OPTIONS) -DWITH_SPGW -o p4c-out/tofino/fabric-spgw/montara \
+		--p4runtime-file p4c-out/tofino/fabric-spgw/montara/fabric.p4info \
 		--p4runtime-format text main.p4
 
 clean: