[svn-commits] russell: branch 1.6.1 r247425 - in /branches/1.6.1: ./ Makefile sounds/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Feb 17 22:21:07 2010
New Revision: 247425

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247425
Log:
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.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile
    branches/1.6.1/sounds/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=247425&r1=247424&r2=247425
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Wed Feb 17 22:21:07 2010
@@ -87,6 +87,7 @@
 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

Modified: branches/1.6.1/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/sounds/Makefile?view=diff&rev=247425&r1=247424&r2=247425
==============================================================================
--- branches/1.6.1/sounds/Makefile (original)
+++ branches/1.6.1/sounds/Makefile Wed Feb 17 22:21:07 2010
@@ -55,8 +55,8 @@
 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)