Browse Source

Merge branch 'master' of git://github.com/kiela/erlang.mk

Loïc Hoguin 11 years ago
parent
commit
4fb6ab9cbc
2 changed files with 5 additions and 2 deletions
  1. 2 0
      README.md
  2. 3 2
      erlang.mk

+ 2 - 0
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
 -------------
 

+ 3 - 2
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)