diff --git a/Makefile b/Makefile
index 0f4096fdd..ddbb11ab4 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,8 @@ ifneq (,$(wildcard $(TPREFIX)/share/gpr/manifests/aws))
 	-$(GPRINSTALL) $(GPROPTS) --uninstall --prefix=$(TPREFIX) aws
 endif
 
-GPRINST_OPTS=-p -f --prefix=$(TPREFIX) --build-var=AWS_BUILD,LIBRARY_TYPE
+GPRINST_OPTS=-p -f --prefix=$(TPREFIX) \
+	--build-var=LIBRARY_TYPE --build-var=AWS_BUILD
 
 install-native: install-clean
 	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_DEFAULT) \
diff --git a/templates_parser b/templates_parser
index 709d71b7b..67bc4a9f2 160000
--- a/templates_parser
+++ b/templates_parser
@@ -1 +1 @@
-Subproject commit 709d71b7ba62cc604cfa3cb6f703712547349399
+Subproject commit 67bc4a9f25b0aa46da07c9981e215e009755578c