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: https://origsvn.digium.com/svn/asterisk/branches/1.4@247422 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 7d403dbdb2c785ae6ca35c34b69ebc3e86e0e8ee..c235f42b29b4a1984b93c3b6648c8f2954ce67cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,7 @@ export TERMCAP_DIR
 export TINFO_DIR
 export GTK2_LIB
 export GTK2_INCLUDE
+export WGET_EXTRA_ARGS
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't

diff --git a/sounds/Makefile b/sounds/Makefile
index 6052c8adf196684c4d819c72cbfbabf6852be008..63ca8fe5a612f82fdb711af77fe9803f367c5246 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -53,8 +53,8 @@ MM:=$(subst -G722,-g722,$(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)