diff options
| author | Rusty Newton <rnewton@digium.com> | 2014-04-18 17:17:25 +0000 |
|---|---|---|
| committer | Rusty Newton <rnewton@digium.com> | 2014-04-18 17:17:25 +0000 |
| commit | 06657c92e61340a9bc3e0d89fa676f93e6581ef1 (patch) | |
| tree | 61c65bfdcc9dbb6ff513f611e88542dbb0b2673c /sounds/Makefile | |
| parent | f5b8ab445f7d3638557afc98eb08a8e0445a58d3 (diff) | |
sounds: Fix Sounds Makefile and XML that didn't support new sound prompt sets
In sounds/Makefile
1 Adds and moves some lines necessary for the en_GB core set. I'm just following how the other sets are defined here.
2 removes the ES extra sounds related lines as we don't have ES extra sound sets.
In sounds/sounds.xml
3 Adds member definitons for EN_AU, EN_GB, IT for core sound sets, and EN_GB in extra sound sets
ASTERISK-23550 #close
Review: https://reviewboard.asterisk.org/r/3464/
........
Merged revisions 412586 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 412587 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'sounds/Makefile')
| -rw-r--r-- | sounds/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index de60ef2f4..87b356f43 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -42,8 +42,8 @@ MCS:=$(subst -SIREN14,-siren14,$(MCS)) CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz) CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION)) MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS)) +MES:=$(subst -EN_GB-,-en_GB-,$(MES)) MES:=$(subst -FR-,-fr-,$(MES)) -MES:=$(subst -ES-,-es-,$(MES)) MES:=$(subst -WAV,-wav,$(MES)) MES:=$(subst -ULAW,-ulaw,$(MES)) MES:=$(subst -ALAW,-alaw,$(MES)) @@ -152,12 +152,10 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(CORE_SOUNDS_ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en,$(EXTRA_SOUNDS_VERSION))) -$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,es,$(EXTRA_SOUNDS_VERSION))) +$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en_GB,$(EXTRA_SOUNDS_VERSION))) $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,fr,$(EXTRA_SOUNDS_VERSION))) -$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en_GB,$(EXTRA_SOUNDS_VERSION))) - $(eval $(call sound_format_lang_rule,$(MOH_DIR),moh,,$(MOH_VERSION))) dist-clean: |