Index: sounds/Makefile =================================================================== --- sounds/Makefile (revision 48136) +++ sounds/Makefile (working copy) @@ -13,7 +13,7 @@ .PHONY: dist-clean all uninstall --include $(ASTTOPDIR)/menuselect.makeopts +-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts PWD:=$(shell pwd) SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds @@ -49,13 +49,19 @@ MM:=$(subst -G729,-g729,$(MM)) MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz) MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%) +WGET=wget WGET_ARGS:=--continue +ifeq ($(OSARCH),FreeBSD) + WGET=fetch + WGET_ARGS= +endif + all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) $(SOUNDS_DIR)/.asterisk-core-sounds-en-%: @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \ (cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ @@ -63,7 +69,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \ (cd $(SOUNDS_DIR)/es; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ @@ -71,7 +77,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \ (cd $(SOUNDS_DIR)/fr; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ @@ -79,7 +85,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \ (cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ @@ -87,7 +93,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \ (cd $(SOUNDS_DIR)/es; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ @@ -95,7 +101,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \ (cd $(SOUNDS_DIR)/fr; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ @@ -103,19 +109,19 @@ $(MOH_DIR)/.asterisk-moh-%: @PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \ - if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ + if test ! -f $${PACKAGE}; then ${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ (cd $(MOH_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \ touch $@ asterisk-core-%.tar.gz: - @wget $(WGET_ARGS) $(SOUNDS_URL)/$@ + @${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$@ asterisk-extra-%.tar.gz: - @wget $(WGET_ARGS) $(SOUNDS_URL)/$@ + @${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$@ asterisk-moh-%.tar.gz: - @wget $(WGET_ARGS) $(SOUNDS_URL)/$@ + @${WGET} $(WGET_ARGS) $(SOUNDS_URL)/$@ dist-clean: rm -f *.tar.gz Index: Makefile =================================================================== --- Makefile (revision 48136) +++ Makefile (working copy) @@ -267,14 +267,14 @@ @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