X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fdownload.mk;h=78848b9c956d2004071c600bf51bcd8c8bbd1c30;hp=406afee48e8139be2e71146ebb531c775b04ab8a;hb=19682a7752733bc6a45026d69c27575b9b7755fd;hpb=8ec6667d79a213dc6f238e1b85882fe4908f171c diff --git a/include/download.mk b/include/download.mk index 406afee48..78848b9c9 100644 --- a/include/download.mk +++ b/include/download.mk @@ -5,13 +5,13 @@ # See /LICENSE for more information. # -DOWNLOAD_RDEP:=$(STAMP_PREPARED) +DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) # Try to guess the download method from the URL define dl_method $(strip \ $(if $(2),$(2), \ - $(if $(filter @GNU/% @KERNEL/% @SF/% ftp://% http://%,$(1)),default, \ + $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://%,$(1)),default, \ $(if $(filter git://%,$(1)),git, \ $(if $(filter svn://%,$(1)),svn, \ $(if $(filter cvs://%,$(1)),cvs, \ @@ -53,7 +53,7 @@ define DownloadMethod/cvs cd $(TMP_DIR)/dl && \ rm -rf $(SUBDIR) && \ [ \! -d $(SUBDIR) ] && \ - cvs -d $(URL) co -r $(VERSION) $(SUBDIR) && \ + cvs -d $(URL) co $(VERSION) $(SUBDIR) && \ find $(SUBDIR) -name CVS | xargs rm -rf && \ echo "Packing checkout..." && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ @@ -132,7 +132,9 @@ define Download endif ) - $(if $(DOWNLOAD_RDEP),$(DOWNLOAD_RDEP): $(DL_DIR)/$(FILE)) + $(foreach dep,$(DOWNLOAD_RDEP), + $(dep): $(DL_DIR)/$(FILE) + ) download: $(DL_DIR)/$(FILE) $(DL_DIR)/$(FILE):