[asterisk-commits] qwell: branch 1.6.1 r261611 - in /branches/1.6.1: ./ sounds/Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu May  6 12:08:21 2010
New Revision: 261611

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261611
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/sounds/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/sounds/Makefile?view=diff&rev=261611&r1=261610&r2=261611
==============================================================================
--- branches/1.6.1/sounds/Makefile (original)
+++ branches/1.6.1/sounds/Makefile Thu May  6 12:08:21 2010
@@ -19,6 +19,7 @@
 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 -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 @@
 	@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 @@
 
 extra_sounds_version:
 	@echo $(EXTRA_SOUNDS_VERSION)
+
+moh_version:
+	@echo $(MOH_VERSION)