From 57f3fc6408539a2fa53199e78195c6f1494873fe Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 30 May 2020 22:29:37 +0000 Subject: makefile_escaping: formatting --- makefile_escaping/escaping_env_vars.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'makefile_escaping') diff --git a/makefile_escaping/escaping_env_vars.mk b/makefile_escaping/escaping_env_vars.mk index f2e7a2d..5ec61ee 100644 --- a/makefile_escaping/escaping_env_vars.mk +++ b/makefile_escaping/escaping_env_vars.mk @@ -7,22 +7,22 @@ SHELL := bash escape = $(subst ','\'',$(1)) -define escape_env +define escape_arg ifeq ($$(origin $(1)),environment) -$(1) := $$(value $(1)) + $(1) := $$(value $(1)) endif ifeq ($$(origin $(1)),environment override) -$(1) := $$(value $(1)) + $(1) := $$(value $(1)) endif ifeq ($$(origin $(1)),command line) -override $(1) := $$(value $(1)) + override $(1) := $$(value $(1)) endif endef simple_var := Simple value -test_var ?= $(simple_var) (in test_var) -$(eval $(call escape_env,test_var)) +test_var ?= $(simple_var) in test_var +$(eval $(call escape_arg,test_var)) simple_var := New simple value composite_var := Composite value - $(simple_var) - $(test_var) -- cgit v1.2.3