From: Thierry Parmentelat Date: Tue, 22 Nov 2011 10:18:31 +0000 (+0100) Subject: minor fixes in fetching secondary url X-Git-Tag: util-vserver-0.30.216-19~1 X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=9c683d59d2f6264e1a48528438380ba656134494 minor fixes in fetching secondary url --- diff --git a/Makefile b/Makefile index 6068eac..26d4ae9 100644 --- a/Makefile +++ b/Makefile @@ -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'" ; \