From d8678a9ff1280c213acab750bc55696282f90400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien@rabbitmq.com>
Date: Wed, 18 Nov 2015 19:02:28 +0100
Subject: Do not export templates as environment variables

We can write the file using the Makefile variables without going
through environment variables.
---
 plugins/bootstrap.mk | 6 +-----
 plugins/c_src.mk     | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk
index dbd115f..464d8fe 100644
--- a/plugins/bootstrap.mk
+++ b/plugins/bootstrap.mk
@@ -344,7 +344,7 @@ endef
 # Plugin-specific targets.
 
 define render_template
-	$(verbose) echo "$${_$(1)}" > $(2)
+	$(verbose) printf -- '$(subst $(newline),\n,$(subst %,%%,$(subst ','\'',$(subst $(tab),$(WS),$(call $(1))))))\n' > $(2)
 endef
 
 ifndef WS
@@ -355,10 +355,6 @@ WS = $(tab)
 endif
 endif
 
-$(foreach template,$(filter bs_% tpl_%,$(.VARIABLES)), \
-	$(eval _$(template) = $$(subst $$(tab),$$(WS),$$($(template)))) \
-	$(eval export _$(template)))
-
 bootstrap:
 ifneq ($(wildcard src/),)
 	$(error Error: src/ directory already exists)
diff --git a/plugins/c_src.mk b/plugins/c_src.mk
index 5cfdeef..e5d6e51 100644
--- a/plugins/c_src.mk
+++ b/plugins/c_src.mk
@@ -192,10 +192,6 @@ hello(_) ->
 	erlang:nif_error({not_loaded, ?MODULE}).
 endef
 
-$(foreach template,bs_c_nif bs_erl_nif, \
-	$(eval _$(template) = $$(subst $$(tab),$$(WS),$$($(template)))) \
-	$(eval export _$(template)))
-
 new-nif:
 ifneq ($(wildcard $(C_SRC_DIR)/$n.c),)
 	$(error Error: $(C_SRC_DIR)/$n.c already exists)
-- 
cgit v1.2.3