diff options
| author | Loïc Hoguin <[email protected]> | 2014-04-23 11:32:48 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-04-23 11:32:48 +0200 |
| commit | b47d3f4c3e097aa28a08f72931d2ce8c50039681 (patch) | |
| tree | 4cfe8d78d2c7d6763eb5d7982621d6d1db4490b2 | |
| parent | 4cb5d53b3019cff7bce1d81f1084320890a9b18b (diff) | |
| parent | 825af962b2d19e67610839ab2b6ac71f16674e7b (diff) | |
| download | erlang.mk-b47d3f4c3e097aa28a08f72931d2ce8c50039681.tar.gz erlang.mk-b47d3f4c3e097aa28a08f72931d2ce8c50039681.tar.bz2 erlang.mk-b47d3f4c3e097aa28a08f72931d2ce8c50039681.zip | |
Merge branch 'master' of git://github.com/kiela/erlang.mk0.2.0
| -rw-r--r-- | erlang.mk | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -60,6 +60,11 @@ export RELX RELX_URL ?= https://github.com/erlware/relx/releases/download/v0.6.0/relx RELX_OPTS ?= +RELX_OUTPUT_DIR ?= _rel + +ifneq ($(firstword $(subst -o,,$(RELX_OPTS))),) + RELX_OUTPUT_DIR = $(firstword $(subst -o,,$(RELX_OPTS))) +endif define get_relx wget -O $(RELX) $(RELX_URL) || rm $(RELX) @@ -73,7 +78,7 @@ $(RELX): @$(call get_relx) clean-rel: - @rm -rf _rel + $(gen_verbose) rm -rf $(RELX_OUTPUT_DIR) endif |