Commit f91afbcc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

contrib: fix curl usage and prefer curl over wget

curl fits Makefile dependencies better, and supports FTP through HTTP
proxies.
parent 9781c400
...@@ -122,17 +122,16 @@ endif ...@@ -122,17 +122,16 @@ endif
endif endif
SVN ?= $(error subversion client (svn) not found!) SVN ?= $(error subversion client (svn) not found!)
ifndef WGET
ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
WGET = wget --passive -c
endif
endif
ifndef WGET
ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),) ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
WGET = curl -L -O download = curl -f -L -- "$(1)" > "$@"
endif else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
download = rm -f $@.tmp && \
wget --passive -c -p -O $@.tmp $(1) && \
touch $@.tmp && \
mv $@.tmp $@
else
download = $(error Neither curl nor wget found!)
endif endif
WGET ?= $(error Neither wget not curl found!)
# #
# Common helpers # Common helpers
...@@ -160,10 +159,6 @@ else ...@@ -160,10 +159,6 @@ else
HOSTCONF += --with-pic HOSTCONF += --with-pic
endif endif
download = rm -f $@.tmp && \
$(WGET) -p -O $@.tmp $(1) && \
touch $@.tmp && \
mv $@.tmp $@
download_git = \ download_git = \
rm -Rf $(@:.tar.xz=) && \ rm -Rf $(@:.tar.xz=) && \
$(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \ $(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment