aboutsummaryrefslogtreecommitdiffstats
path: root/sounds/Makefile
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 04:20:11 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 04:20:11 +0000
commit3fbc021972b84cbd0f6afa77e7823a3f057a73db (patch)
tree02be55e3604d2eb37956df79e3914915e55d9197 /sounds/Makefile
parent86e437c3c370500dd9600a8bdfff78b82290e4c6 (diff)
Merged revisions 247422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r247422 | russell | 2010-02-17 22:19:01 -0600 (Wed, 17 Feb 2010) | 10 lines Tweak argument handling for wget in the sounds Makefile. 1) Fix the check to see if we are using wget to not be full of fail. The configure script populates this variable with the absolute path to wget if it is found, so it didn't work. 2) Allow some extra arguments to be passed in for wget. This is just a simple change to allow our Bamboo build script to tell wget to be quiet and not fill up our logs with download status output. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@247423 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds/Makefile')
-rw-r--r--sounds/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile
index 31789d715..55102567d 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -61,8 +61,8 @@ MM:=$(subst -SIREN14,-siren14,$(MM))
MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz)
MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
# If "fetch" is used, --continue is not a valid option.
-ifeq ($(WGET),wget)
-WGET_ARGS:=--continue
+ifneq ($(findstring wget,$(WGET)),)
+WGET_ARGS:=--continue $(WGET_EXTRA_ARGS)
endif
all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)