Merged revisions 247423 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r247423 | russell | 2010-02-17 22:20:11 -0600 (Wed, 17 Feb 2010) | 17 lines

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

diff --git a/Makefile b/Makefile
index 50594e213f3e801efdbec1452c9bb5b542c613f8..6a15b7e4c632088a3df43b667cad69b928df4e25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,7 @@ export AWK
 export GREP
 export ID
 export MD5
+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 1e1c2ae9b84a0bed4179653120a9036df2d29ad2..fe362d4a52af9fb0e181d0ab23520cec68af00d2 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -55,8 +55,8 @@ MM:=$(subst -SLN16,-sln16,$(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)