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.2@247426 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 55af2deddabd975a5a350d4cac16375afe26f497..961f342199a42483460af44446ac0c9ecfe4b0f3 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 31789d71534f1f9236d4ae0429dc67b2fc829b98..55102567d241547da7aadddb1cfe6b3186c881eb 100644 (file)
--- 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)