X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=71eb967ad74879f077b7e619cd068a4497691f4d;hb=c8ea1204e9e11ea1d34256f8cdb667ddaa7d4377;hp=dd8d1d0d8143e44a1b373d2db7e3c487d17a0ed7;hpb=167da5ae6bd4cf6e6b8504a426cb07af0900467e;p=util-vserver.git diff --git a/Makefile b/Makefile index dd8d1d0..71eb967 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ WEBFETCH := wget SHA1SUM := sha1sum ALL += util-vserver -util-vserver-URL1 := http://build.planet-lab.org/third-party/util-vserver-0.30.216-pre2939.tar.bz2 -util-vserver-URL2 := http://mirror.onelab.eu/third-party/util-vserver-0.30.216-pre2939.tar.bz2 -util-vserver-SHA1SUM := 2fc905190fed57a4a31b6191c6d085cd699e65b6 -util-vserver := $(notdir $(util-vserver-URL)) +util-vserver := util-vserver-0.30.216-pre3004.tar.bz2 +util-vserver-SHA1SUM := 9d2565dde57ff583dda35357a2542b87a5817d61 +util-vserver-URL1 := http://build.planet-lab.org/third-party/$(util-vserver) +util-vserver-URL2 := http://mirror.onelab.eu/third-party/$(util-vserver) all: $(ALL) .PHONY: all @@ -14,11 +14,11 @@ all: $(ALL) ############################## define download_target $(1): $($(1)) -.PHONY: $($(1)) +.PHONY: $(1) $($(1)): @if [ ! -e "$($(1))" ] ; then \ { echo Using primary; echo "$(WEBFETCH) $($(1)-URL1)" ; $(WEBFETCH) $($(1)-URL1) ; } || \ - { echo Using primary; echo "$(WEBFETCH) $($(1)-URL2)" ; $(WEBFETCH) $($(1)-URL2) ; } ; fi + { 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'" ; \