aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Kieliszczyk <[email protected]>2013-11-13 17:35:26 +0100
committerKamil Kieliszczyk <[email protected]>2013-11-13 17:35:26 +0100
commit02309f4900e9f27c7baab8befe559e0ed0e50d79 (patch)
tree30cbef0372e381393b3d203ad61a795e8b46fdae
parent4a1942695b8aa000e22ac5533474725dc7690ec6 (diff)
downloaderlang.mk-02309f4900e9f27c7baab8befe559e0ed0e50d79.tar.gz
erlang.mk-02309f4900e9f27c7baab8befe559e0ed0e50d79.tar.bz2
erlang.mk-02309f4900e9f27c7baab8befe559e0ed0e50d79.zip
Add relx improvements
Add ability to config relx in-line options by setting RELX_OPTS Fix using RELX_CONFIG variable Use relx 0.5.0
-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 00711a4..3b0c694 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,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 d5fa2aa..a76a67a 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.0/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)