vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Jun 20 14:22:28 2016 +0200| [392c3c604685285df18db754d25f02f69e6055c4] | committer: Jean-Baptiste Kempf
Contribs: fix dual-download with wget (cherry picked from commit 61ba4c1571ee1d1ef77c0b0e492d93bc94b7ee47) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=392c3c604685285df18db754d25f02f69e6055c4 --- contrib/src/main.mak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index bd87ba8..14035fb 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -223,15 +223,15 @@ SVN ?= $(error subversion client (svn) not found!) ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),) download = curl -f -L -- "$(1)" > "$@" else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),) -download = rm -f [email protected] && \ +download = (rm -f [email protected] && \ wget --passive -c -p -O [email protected] "$(1)" && \ touch [email protected] && \ - mv [email protected] $@ + mv [email protected] $@ ) else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),) -download = rm -f [email protected] && \ +download = (rm -f [email protected] && \ fetch -p -o [email protected] "$(1)" && \ touch [email protected] && \ - mv [email protected] $@ + mv [email protected] $@) else download = $(error Neither curl nor wget found!) endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
