X-Git-Url: http://git.onelab.eu/?p=pyaspects.git;a=blobdiff_plain;f=Makefile;h=cc421416ca22d6549ee5ef3f664d5922761cdde0;hp=ab0eb1c488f195d741dc423450c3c5f731bfadc4;hb=HEAD;hpb=533450357f44755c0a12b633a6731fc406a77f6f

diff --git a/Makefile b/Makefile
index ab0eb1c..cc42141 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
-# $Id$
-# $URL$
 #
 WEBFETCH		:= wget
 SHA1SUM			:= sha1sum
 
 ALL			+= pyaspects
-pyaspects-URL		:= http://build.planet-lab.org/third-party/pyaspects-0.3.tar.gz
-pyaspects-SHA1SUM	:= bd3dde2f9dc8250f1c73fa1a7c6ed38d20faffa9
-pyaspects		:= $(notdir $(pyaspects-URL))
+pyaspects-URL1		:= http://mirror.onelab.eu/third-party/pyaspects-0.4.1.tar.gz
+pyaspects-URL2		:= http://build.planet-lab.org/third-party/pyaspects-0.4.1.tar.gz
+pyaspects-SHA1SUM	:= 6b9f0b5711b98ed2a6c6a85713325158de96193a
+pyaspects		:= $(notdir $(pyaspects-URL1))
 
 all: $(ALL)
 .PHONY: all
@@ -15,9 +14,11 @@ all: $(ALL)
 ##############################
 define download_target
 $(1): $($(1))
-.PHONY: $($(1))
+.PHONY: $(1)
 $($(1)): 
-	@if [ ! -e "$($(1))" ] ; then echo "$(WEBFETCH) $($(1)-URL)" ; $(WEBFETCH) $($(1)-URL) ; fi
+	@if [ ! -e "$($(1))" ] ; then \
+	{ echo Using primary; echo "$(WEBFETCH) $($(1)-URL1)" ; $(WEBFETCH) $($(1)-URL1) ; } || \
+	{ echo Using secondary; echo "$(WEBFETCH) $($(1)-URL2)" ; $(WEBFETCH) $($(1)-URL2) ; } ; fi
 	@if [ ! -e "$($(1))" ] ; then echo "Could not download source file: $($(1)) does not exist" ; exit 1 ; fi
 	@if test "$$$$($(SHA1SUM) $($(1)) | awk '{print $$$$1}')" != "$($(1)-SHA1SUM)" ; then \
 	    echo "sha1sum of the downloaded $($(1)) does not match the one from 'Makefile'" ; \
@@ -31,7 +32,7 @@ endef
 
 $(eval $(call download_target,pyaspects))
 
-sources: $(ALL)
+sources: $(ALL) 
 .PHONY: sources
 
 ####################