automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@75303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2025-11-07 10:28:32 +00:00 · 2007-07-16 19:33:26 +00:00
parent 8872e64252
commit 0b7104eaa0
5 changed files with 4 additions and 1 deletions
--- a/2
+++ b/2
@@ -799,7 +799,7 @@ samples: adsi
 		fi; \
 	done
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-	for x in sounds/*.mp3; do \
+	for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 	done
 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
--- a/sounds/moh/LICENSE
+++ b/sounds/moh/LICENSE
@@ -0,0 +1,3 @@
+Music Provided By www.freeplaymusic.com. These sound files are provided by
+Digium under license from Freeplay Music Corporation for use in conjunction
+with the Asterisk software only.
--- a/sounds/moh/fpm-calm-river.mp3
+++ b/sounds/moh/fpm-calm-river.mp3
--- a/sounds/moh/fpm-sunshine.mp3
+++ b/sounds/moh/fpm-sunshine.mp3
--- a/sounds/moh/fpm-world-mix.mp3
+++ b/sounds/moh/fpm-world-mix.mp3