[vlc-commits] Contribs: provide a macro to do dual downloading

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jun 20 12:01:00 2016 +0200| [7394048b906730fdeffd324f1f8c33be46c829f3] | committer: Jean-Baptiste Kempf

Contribs: provide a macro to do dual downloading

First from videolan ftp, then original page

There might be a more elegant way of doing so...

(cherry picked from commit 29fc50d7fa68f6318d942b1f3dfa5d7ad75660ff)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=7394048b906730fdeffd324f1f8c33be46c829f3
---

 contrib/src/main.mak |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index d3be485..bd87ba8 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -236,6 +236,9 @@ else
 download = $(error Neither curl nor wget found!)
 endif
 
+download_pkg = $(call download,$(CONTRIB_VIDEOLAN)/$(2)/$(lastword $(subst /, ,$(@)))) || \
+	$(call download,$(1)) && echo "Please upload this package $(lastword $(subst /, ,$(@))) to our FTP"
+
 ifeq ($(shell which xzcat >/dev/null 2>&1 || echo FAIL),)
 XZCAT = xzcat
 else