[svn-commits] russell: branch 1.4 r247422 - in /branches/1.4: Makefile sounds/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Feb 17 22:19:01 2010
New Revision: 247422

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247422
Log:
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.4/Makefile
    branches/1.4/sounds/Makefile

Modified: branches/1.4/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/Makefile?view=diff&rev=247422&r1=247421&r2=247422
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Feb 17 22:19:01 2010
@@ -74,6 +74,7 @@
 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

Modified: branches/1.4/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/sounds/Makefile?view=diff&rev=247422&r1=247421&r2=247422
==============================================================================
--- branches/1.4/sounds/Makefile (original)
+++ branches/1.4/sounds/Makefile Wed Feb 17 22:19:01 2010
@@ -53,8 +53,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)