Mercurial > mxe-octave

changeset 305:d3cbc6a36d1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved download mechanism
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 05 Apr 2009 11:54:24 +0200
parents 998fcdb80a11
children 85ffa9259036
files Makefile
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Apr 05 11:31:09 2009 +0200
+++ b/Makefile	Sun Apr 05 11:54:24 2009 +0200
@@ -57,9 +57,6 @@
 UNPACK_PKG_ARCHIVE = \
     $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE))
 
-DOWNLOAD = \
-    $(if $(2),wget -T 30 -t 3 -c '$(1)' || wget -c '$(2)',wget -c '$(1)')
-
 .PHONY: all
 all: $(PKG_RULES)
 
@@ -71,7 +68,10 @@
 	[ -d '$(PKG_DIR)' ] || mkdir -p '$(PKG_DIR)'
 	cd '$(PKG_DIR)' && ( \
 	    $(call CHECK_ARCHIVE,$($(1)_FILE)) || \
-	    $(call DOWNLOAD,$($(1)_URL),$($(1)_URL_2)) )
+	    $(if $($(1)_URL_2), \
+	        wget -T 30 -t 3 -c -O '$($(1)_FILE)' '$($(1)_URL)' || \
+	            wget -c -O '$($(1)_FILE)' '$($(1)_URL_2)', \
+	        wget -c -O '$($(1)_FILE)' '$($(1)_URL)'))
 	$(if $(value $(1)_BUILD),
 	    rm -rf   '$(2)'
 	    mkdir -p '$(2)'