diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-11-18 19:14:16 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-11-18 19:14:16 +0100 |
| commit | 8438158962429fa8d0ca8dacabffa31ba7297cb4 (patch) | |
| tree | 1616d697827b63a7f58f31ae9e24175fd064d2dc | |
| parent | 4435fe411f0e4cb5f6dc8fd5f74fbe23c62e565d (diff) | |
| download | rabbitmq-server-git-8438158962429fa8d0ca8dacabffa31ba7297cb4.tar.gz | |
Update erlang.mk
| -rw-r--r-- | erlang.mk | 27 |
1 files changed, 6 insertions, 21 deletions
@@ -16,7 +16,7 @@ ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) -ERLANG_MK_VERSION = 1.2.0-847-gb87a0d7-dirty +ERLANG_MK_VERSION = 1.2.0-849-g93261ea-dirty # Core configuration. @@ -5457,21 +5457,10 @@ endef # Plugin-specific targets. define render_template - $(verbose) echo "$${_$(1)}" > $(2) + $(shell mkdir -p $(dir $(2))) + $(file > $(2),$(call $(1))) endef -ifndef WS -ifdef SP -WS = $(subst a,,a $(wordlist 1,$(SP),a a a a a a a a a a a a a a a a a a a a)) -else -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) @@ -5479,7 +5468,7 @@ endif $(eval p := $(PROJECT)) $(eval n := $(PROJECT)_sup) $(call render_template,bs_Makefile,Makefile) - $(verbose) mkdir src/ + $(verbose) mkdir -p src/ ifdef LEGACY $(call render_template,bs_appsrc,src/$(PROJECT).app.src) endif @@ -5492,7 +5481,7 @@ ifneq ($(wildcard src/),) endif $(eval p := $(PROJECT)) $(call render_template,bs_Makefile,Makefile) - $(verbose) mkdir src/ + $(verbose) mkdir -p src/ ifdef LEGACY $(call render_template,bs_appsrc_lib,src/$(PROJECT).app.src) endif @@ -5506,7 +5495,7 @@ ifneq ($(wildcard rel/),) endif $(eval p := $(PROJECT)) $(call render_template,bs_relx_config,relx.config) - $(verbose) mkdir rel/ + $(verbose) mkdir -p rel/ $(call render_template,bs_sys_config,rel/sys.config) $(call render_template,bs_vm_args,rel/vm.args) @@ -5757,10 +5746,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) |
