mirror of
https://github.com/asterisk/asterisk.git
synced 2026-01-07 10:31:16 +00:00
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.4@247422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
1
Makefile
1
Makefile
@@ -74,6 +74,7 @@ export TERMCAP_DIR
|
||||
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
|
||||
|
||||
@@ -53,8 +53,8 @@ MM:=$(subst -G722,-g722,$(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)
|
||||
|
||||
Reference in New Issue
Block a user