From: Automerge Script <automerge@asterisk.org>
Date: Mon, 16 Jul 2007 19:33:26 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.22-netsec~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b7104eaa0519fddd89d75b17baaa8f329f9394e;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@75303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 16bda55683..bbef57878c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/sounds/moh/LICENSE b/sounds/moh/LICENSE
new file mode 100644
index 0000000000..adefcc4ad3
--- /dev/null
+++ 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.
diff --git a/sounds/fpm-calm-river.mp3 b/sounds/moh/fpm-calm-river.mp3
similarity index 100%
rename from sounds/fpm-calm-river.mp3
rename to sounds/moh/fpm-calm-river.mp3
diff --git a/sounds/fpm-sunshine.mp3 b/sounds/moh/fpm-sunshine.mp3
similarity index 100%
rename from sounds/fpm-sunshine.mp3
rename to sounds/moh/fpm-sunshine.mp3
diff --git a/sounds/fpm-world-mix.mp3 b/sounds/moh/fpm-world-mix.mp3
similarity index 100%
rename from sounds/fpm-world-mix.mp3
rename to sounds/moh/fpm-world-mix.mp3