aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-12-02 12:15:20 +0100
committerLoïc Hoguin <[email protected]>2013-12-02 12:15:20 +0100
commit893e612b61400005f692f58606dcdf2949568889 (patch)
tree761f330b220aaa7f01e3bdf953f2830607ed86a5
parentdf818625545d565b8b76fbc445063a4822114b93 (diff)
downloadcowboy-893e612b61400005f692f58606dcdf2949568889.tar.gz
cowboy-893e612b61400005f692f58606dcdf2949568889.tar.bz2
cowboy-893e612b61400005f692f58606dcdf2949568889.zip
Update erlang.mk
-rw-r--r--erlang.mk13
1 files changed, 8 insertions, 5 deletions
diff --git a/erlang.mk b/erlang.mk
index d5fa2aa..0dadfbb 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -24,7 +24,7 @@ export PKG_FILE
PKG_FILE_URL ?= https://raw.github.com/extend/erlang.mk/master/packages.v1.tsv
define get_pkg_file
- wget -O $(PKG_FILE) $(PKG_FILE_URL) || rm $(PKG_FILE)
+ wget --no-check-certificate -O $(PKG_FILE) $(PKG_FILE_URL) || rm $(PKG_FILE)
endef
# Verbosity and tweaks.
@@ -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)
@@ -106,7 +107,7 @@ app: ebin/$(PROJECT).app
$(eval MODULES := $(shell find ebin -type f -name \*.beam \
| sed 's/ebin\///;s/\.beam/,/' | sed '$$s/.$$//'))
$(appsrc_verbose) cat src/$(PROJECT).app.src \
- | sed 's/{modules,\s*\[\]}/{modules, \[$(MODULES)\]}/' \
+ | sed 's/{modules,[[:space:]]*\[\]}/{modules, \[$(MODULES)\]}/' \
> ebin/$(PROJECT).app
define compile_erl
@@ -189,9 +190,11 @@ clean-deps:
# Documentation.
+EDOC_OPTS ?=
+
docs: clean-docs
$(gen_verbose) erl -noshell \
- -eval 'edoc:application($(PROJECT), ".", []), init:stop().'
+ -eval 'edoc:application($(PROJECT), ".", [$(EDOC_OPTS)]), init:stop().'
clean-docs:
$(gen_verbose) rm -f doc/*.css doc/*.html doc/*.png doc/edoc-info