diff --git a/sounds/Makefile b/sounds/Makefile index f0a5530d83..08b94a74d8 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -18,11 +18,12 @@ PWD:=$(shell pwd) SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.4.19 +CORE_SOUNDS_VERSION:=1.4.20 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 -EN_AU-,-en_AU-,$(MCS)) MCS:=$(subst -FR-,-fr-,$(MCS)) MCS:=$(subst -ES-,-es-,$(MCS)) MCS:=$(subst -WAV,-wav,$(MCS)) @@ -70,7 +71,7 @@ have_download: echo "*** ***"; \ echo "*** Please install one of these, or remove any ***"; \ echo "*** extra sound package selections in ***"; \ - echo "*** menuselecct before installing Asterisk. ***"; \ + echo "*** menuselect before installing Asterisk. ***"; \ echo "*** ***"; \ echo "**************************************************"; \ exit 1; \ @@ -84,6 +85,14 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-en-%: have_download (cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xof -) && \ touch $@ +$(SOUNDS_DIR)/.asterisk-core-sounds-en_AU-%: have_download + @PACKAGE=$(subst $(SOUNDS_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 -$(CORE_SOUNDS_VERSION),,$@)-* && \ + (cd $(SOUNDS_DIR)/en_AU; cat $(PWD)/$${PACKAGE} | gzip -d | tar xof -) && \ + touch $@ + $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download @PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \ if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \ @@ -144,10 +153,10 @@ asterisk-moh-%.tar.gz: have_download dist-clean: rm -f *.tar.gz -$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr: +$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr: mkdir -p $@ -install: $(SOUNDS_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS) +install: $(SOUNDS_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS) uninstall: rm -rf $(SOUNDS_DIR) diff --git a/sounds/sounds.xml b/sounds/sounds.xml index fe7bebd3e1..5ce8f4bff5 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -36,6 +36,18 @@ + + + + + + + + + + + + @@ -51,7 +63,7 @@ - +