diff --git a/sounds/Makefile b/sounds/Makefile index 702ed45001e37a7892a0d266a606661d3a655aed..dfbb45ffa65d9d1dbc4e2b59667b95c4ef1bff88 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -19,6 +19,7 @@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh CORE_SOUNDS_VERSION:=1.4.18 EXTRA_SOUNDS_VERSION:=1.4.11 +MOH_VERSION:=2.03 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) MCS:=$(subst -FR-,-fr-,$(MCS)) @@ -58,8 +59,8 @@ MM:=$(subst -G722,-g722,$(MM)) MM:=$(subst -SLN16,-sln16,$(MM)) MM:=$(subst -SIREN7,-siren7,$(MM)) MM:=$(subst -SIREN14,-siren14,$(MM)) -MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz) -MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%) +MOH:=$(MM:MOH-%=asterisk-moh-%-$(MOH_VERSION).tar.gz) +MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%-$(MOH_VERSION)) # If "fetch" is used, --continue is not a valid option. ifneq ($(findstring wget,$(WGET)),) WGET_ARGS:=--continue $(WGET_EXTRA_ARGS) @@ -135,6 +136,7 @@ $(MOH_DIR)/.asterisk-moh-%: have_download @PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \ if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ if test ! -f $${PACKAGE}; then exit 1; fi; \ + rm -f $(subst -$(MOH_VERSION),,$@)-* && \ (cd $(MOH_DIR); cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ @@ -164,3 +166,6 @@ core_sounds_version: extra_sounds_version: @echo $(EXTRA_SOUNDS_VERSION) + +moh_version: + @echo $(MOH_VERSION)