aboutsummaryrefslogtreecommitdiffstats
path: root/sounds/Makefile
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-18 22:14:05 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-18 22:14:05 +0000
commit5dfdf6d60cf1e8adcb52feb8bb828137d33f656b (patch)
tree204dec086d043338dc31e773e197fa79dd761201 /sounds/Makefile
parent9c926f01e3bc0d5bb93c261446fbbb979b62a4be (diff)
Merged revisions 292225 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r292225 | lmadsen | 2010-10-18 16:51:23 -0500 (Mon, 18 Oct 2010) | 24 lines Merged revisions 292224 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r292224 | lmadsen | 2010-10-18 16:50:47 -0500 (Mon, 18 Oct 2010) | 17 lines Merged revisions 292222 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r292222 | lmadsen | 2010-10-18 16:47:25 -0500 (Mon, 18 Oct 2010) | 9 lines Add support for the new English (Australian Accent) sound files. (closes issue #17426) Reported by: camsown Patches: core-sounds-en_AU.txt uploaded by camsown (license 1050) add_AU_sounds.patch.txt uploaded by lmadsen (license 10) Tested by: camsown, lmadsen, jtodd, qwell ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@292231 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds/Makefile')
-rw-r--r--sounds/Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/sounds/Makefile b/sounds/Makefile
index 82a2f61e6..0945e6741 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -19,11 +19,12 @@ CMD_PREFIX?=@
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
SOUNDS_CACHE_DIR?=
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))
@@ -143,7 +144,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; \
@@ -151,6 +152,8 @@ have_download:
$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION)))
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_AU,$(CORE_SOUNDS_VERSION)))
+
$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,es,$(CORE_SOUNDS_VERSION)))
$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION)))
@@ -172,10 +175,10 @@ $(eval $(call sound_download_rule,moh))
dist-clean:
rm -f *.tar.gz
-$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
+$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
$(INSTALL) -d $@
-install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(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)