[asterisk-commits] jcollie: branch jcollie/sounds-install r37984 - in /team/jcollie/sounds-insta...

[asterisk-commits at lists.digium.com]

Author: jcollie
Date: Wed Jul 19 14:15:31 2006
New Revision: 37984

URL: http://svn.digium.com/view/asterisk?rev=37984&view=rev
Log:
Merged revisions 37973-37974 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r37973 | kpfleming | 2006-07-19 13:33:14 -0500 (Wed, 19 Jul 2006) | 2 lines

use new sound file version

........
r37974 | kpfleming | 2006-07-19 13:50:55 -0500 (Wed, 19 Jul 2006) | 2 lines

make installation of French and Spanish sounds work properly

........

Modified:
    team/jcollie/sounds-install/   (props changed)
    team/jcollie/sounds-install/sounds/Makefile

Propchange: team/jcollie/sounds-install/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/jcollie/sounds-install/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 19 14:15:31 2006
@@ -1,1 +1,1 @@
-/trunk:1-37961
+/trunk:1-37983

Modified: team/jcollie/sounds-install/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/sounds-install/sounds/Makefile?rev=37984&r1=37983&r2=37984&view=diff
==============================================================================
--- team/jcollie/sounds-install/sounds/Makefile (original)
+++ team/jcollie/sounds-install/sounds/Makefile Wed Jul 19 14:15:31 2006
@@ -20,7 +20,7 @@
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.0
+CORE_SOUNDS_VERSION:=1.4.1
 EXTRA_SOUNDS_VERSION:=1.4.0
 SOUNDS_URL:=http://ftp.digium.com/pub/telephony/sounds/releases
 MOH_URL:=http://ftp.digium.com/pub/telephony/sounds
@@ -86,7 +86,7 @@
 
 .PHONY: $(SOUNDS_DIR) $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/es $(MOH_DIR)
 
-$(SOUNDS_DIR) $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/es $(MOH_DIR):
+$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr:
 	mkdir -p $@
 
 install: $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)