diff options
| -rw-r--r-- | core/core.mk | 6 | ||||
| -rw-r--r-- | core/deps.mk | 2 | ||||
| -rw-r--r-- | erlang.mk | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/core/core.mk b/core/core.mk index d25897b..ec42331 100644 --- a/core/core.mk +++ b/core/core.mk @@ -62,6 +62,12 @@ help:: # Core functions. +ifeq ($(shell which wget 2>/dev/null | wc -l), 1) define core_http_get wget --no-check-certificate -O $(1) $(2)|| rm $(1) endef +else +define core_http_get + erl -noshell -eval 'ssl:start(), inets:start(), case httpc:request(get, {"$(2)", []}, [{autoredirect, true}], []) of {ok, {{_, 200, _}, _, Body}} -> case file:write_file("$(1)", Body) of ok -> ok; {error, R1} -> halt(R1) end; {error, R2} -> halt(R2) end, halt(0).' +endef +endif diff --git a/core/deps.mk b/core/deps.mk index a7c35f5..490e675 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -81,7 +81,7 @@ distclean-deps: # Packages related targets. $(PKG_FILE2): - $(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)) + @$(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)) pkg-list: $(PKG_FILE2) @cat $(PKG_FILE2) | awk 'BEGIN { FS = "\t" }; { print \ @@ -62,9 +62,15 @@ help:: # Core functions. +ifeq ($(shell which wget 2>/dev/null | wc -l), 1) define core_http_get wget --no-check-certificate -O $(1) $(2)|| rm $(1) endef +else +define core_http_get + erl -noshell -eval 'ssl:start(), inets:start(), case httpc:request(get, {"$(2)", []}, [{autoredirect, true}], []) of {ok, {{_, 200, _}, _, Body}} -> case file:write_file("$(1)", Body) of ok -> ok; {error, R1} -> halt(R1) end; {error, R2} -> halt(R2) end, halt(0).' +endef +endif # Copyright (c) 2013-2014, Loïc Hoguin <[email protected]> # This file is part of erlang.mk and subject to the terms of the ISC License. @@ -149,7 +155,7 @@ distclean-deps: # Packages related targets. $(PKG_FILE2): - $(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)) + @$(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)) pkg-list: $(PKG_FILE2) @cat $(PKG_FILE2) | awk 'BEGIN { FS = "\t" }; { print \ |