aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-12-02 12:02:24 +0100
committerLoïc Hoguin <[email protected]>2013-12-02 12:02:24 +0100
commit4fb6ab9cbce147ad319a903b76f5e717b109ccbb (patch)
tree1dc5518d31483ab3861ada6b09da851b8a06cb8a
parent62f726a2f150a781bbb7097939ab154ab316d1cd (diff)
parent7b87d30cf0d255724128217fd9951437be01af68 (diff)
downloaderlang.mk-4fb6ab9cbce147ad319a903b76f5e717b109ccbb.tar.gz
erlang.mk-4fb6ab9cbce147ad319a903b76f5e717b109ccbb.tar.bz2
erlang.mk-4fb6ab9cbce147ad319a903b76f5e717b109ccbb.zip
Merge branch 'master' of git://github.com/kiela/erlang.mk
-rw-r--r--README.md2
-rw-r--r--erlang.mk5
2 files changed, 5 insertions, 2 deletions
diff --git a/README.md b/README.md
index e01761b..460882d 100644
--- a/README.md
+++ b/README.md
@@ -204,6 +204,8 @@ file is fetched.
`RELX_URL` is the location where `relx` can be downloaded if it is
not found locally.
+`RELX_OPTS` is for setting relx in-line options, if any.
+
Extra targets
-------------
diff --git a/erlang.mk b/erlang.mk
index 7aacbcd..a0f891a 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -58,7 +58,8 @@ ifneq ($(wildcard $(RELX_CONFIG)),)
RELX ?= $(CURDIR)/relx
export RELX
-RELX_URL ?= https://github.com/erlware/relx/releases/download/0.4.0/relx
+RELX_URL ?= https://github.com/erlware/relx/releases/download/v0.5.2/relx
+RELX_OPTS ?=
define get_relx
wget -O $(RELX) $(RELX_URL) || rm $(RELX)
@@ -66,7 +67,7 @@ define get_relx
endef
rel: clean-rel all $(RELX)
- @$(RELX)
+ @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS)
$(RELX):
@$(call get_relx)