dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@247423 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2010-02-18 04:20:11 +00:00
parent 86e437c3c3
commit 3fbc021972
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -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

4
sounds/Makefile
View File

@ -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)