FreeBSD 6.1 does not include wget by default. However, it has fetch which will

work just fine for our purposes of downloading the sounds packages.  So, check
for both wget and fetch and the configure script and use what was found to
download them.  If neither one was found, and sound packages are selected that
must be downloaded, the install process will print out an informative error
message indicating the situation.

Also, fix a couple places where "make" was hard coded into some output messages
by replacing them with the $(MAKE) variable.

(issue #8451, initial patch by pabelanger, with additional modifications by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-12-01 23:16:28 +00:00
parent 8cbe6025b6
commit fee1970293
5 changed files with 154 additions and 32 deletions

View File

@@ -57,6 +57,7 @@ export DESTDIR
export PROC
export SOLINK
export STRIP
export DOWNLOAD
# 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
@@ -273,14 +274,14 @@ all: _all
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
@echo " + make install +"
@echo " + $(MAKE) install +"
@echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
@echo "**** The configure script must be executed before running 'make'."
@echo "**** The configure script must be executed before running '$(MAKE)'."
@echo "****"
@exit 1