Permalink
Browse files

Update erlang.mk

  • Loading branch information...
1 parent f541942 commit 47b13df5bdc01ecf6ec8a79dd2ec4e7393b22923 @essen essen committed Dec 2, 2013
Showing with 8 additions and 5 deletions.
  1. +8 −5 erlang.mk
View
@@ -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,15 +58,16 @@ 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)
chmod +x $(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

0 comments on commit 47b13df

Please sign in to comment.