From fddb63e469f920f1acc55f17bc46af6fad6ff80b Mon Sep 17 00:00:00 2001 From: russell Date: Thu, 18 Feb 2010 04:21:07 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@247425 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 50594e213..6a15b7e4c 100644 --- 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 -- cgit v1.2.3