diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-06 17:08:21 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-06 17:08:21 +0000 |
| commit | 7282ce86a0c25d8205516f103ce15f3fda6064cd (patch) | |
| tree | b574ac93a9d849d9349bc58587c923246fb0bf8f /sounds | |
| parent | 1b3a0de80aa305fb5d73f2ce8b6a2f0805bbf81d (diff) | |
Merged revisions 261609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r261609 | qwell | 2010-05-06 12:06:40 -0500 (Thu, 06 May 2010) | 11 lines
Merged revisions 261608 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r261608 | qwell | 2010-05-06 11:56:02 -0500 (Thu, 06 May 2010) | 4 lines
Use the versioned MOH tarballs, now that we have them.
This makes for more reproducibility. Prompted by a discussion in #asterisk-dev
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261611 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index b1c2045f5..9e70feb0a 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)) @@ -52,8 +53,8 @@ MM:=$(subst -GSM,-gsm,$(MM)) MM:=$(subst -G729,-g729,$(MM)) MM:=$(subst -G722,-g722,$(MM)) MM:=$(subst -SLN16,-sln16,$(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) @@ -129,6 +130,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 $@ @@ -158,3 +160,6 @@ core_sounds_version: extra_sounds_version: @echo $(EXTRA_SOUNDS_VERSION) + +moh_version: + @echo $(MOH_VERSION) |