package/: convert to DOWNLOAD helper

2 files changed, 15 insertions, 15 deletions

diff --git a/package/multimedia/festival/lexicons/festlex.mk b/package/multimedia/festival/lexicons/festlex.mk
index e9a651dd8..80d37d595 100644
--- a/package/multimedia/festival/lexicons/festlex.mk
+++ b/package/multimedia/festival/lexicons/festlex.mk
@@ -12,13 +12,13 @@ FESTLEX_INSTALL_DIR = $(TARGET_DIR)/usr/share
 $(FESTLEX_STATUS_DIR)/.downloaded:
 	mkdir -p $(FESTLEX_STATUS_DIR)
 ifeq ($(BR2_PACKAGE_FESTLEX_CMU),y)
-	$(Q)test -e $(DL_DIR)/$(LEX1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX1)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX1))
 endif
 ifeq ($(BR2_PACKAGE_FESTLEX_OALD),y)
-	$(Q)test -e $(DL_DIR)/$(LEX2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX2)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX2))
 endif
 ifeq ($(BR2_PACKAGE_FESTLEX_POS),y)
-	$(Q)test -e $(DL_DIR)/$(LEX3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX3)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX3))
 endif
 	touch $@
 
diff --git a/package/multimedia/festival/voices/festvox.mk b/package/multimedia/festival/voices/festvox.mk
index d44493c83..a2ee169f3 100644
--- a/package/multimedia/festival/voices/festvox.mk
+++ b/package/multimedia/festival/voices/festvox.mk
@@ -21,35 +21,35 @@ FESTVOX_INSTALL_DIR = $(TARGET_DIR)/usr/share
 $(FESTVOX_STATUS_DIR)/.downloaded:
 	mkdir -p $(FESTVOX_STATUS_DIR)
 ifeq ($(BR2_PACKAGE_FESTVOX_AWB),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE1)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE1))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_BDL),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE2)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE2))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_JMK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE3)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE3))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_SLT),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE4) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE4)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE4))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_AWB_MULTISYN),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE5) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE5)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE5))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_JMK_MULTISYN),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE6) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE6)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE6))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_KAL_SIXTEENK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE7) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE7)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE7))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_KED_EIGHTK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE8) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE8)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE8))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_KED_SIXTEENK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE9) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE9)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE9))
 endif
-	$(Q)test -e $(DL_DIR)/$(FRONTEND1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND1)
-	$(Q)test -e $(DL_DIR)/$(FRONTEND2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND2)
-	$(Q)test -e $(DL_DIR)/$(FRONTEND3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND3)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND1))
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND2))
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND3))
 
 	touch $@