# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1208455941 0
# Node ID 95cc0ba5410fc8dac1ec3dcec0fda27256e8bbd4
# Parent  8a814bbbedfab8007967239c8789c7bd2f80badb
Merged r546:548 from branches/stable-1.0: "make dist" svn fix.

diff -r 8a814bbbedfa -r 95cc0ba5410f CHANGELOG
--- a/CHANGELOG	Thu Apr 17 18:08:02 2008 +0000
+++ b/CHANGELOG	Thu Apr 17 18:12:21 2008 +0000
@@ -3,7 +3,8 @@
  */
 
 04172008 - Look for Speex includes in new directory. Converted all text
-           encoding from ISO-8859-1 to UTF-8.
+           encoding from ISO-8859-1 to UTF-8. Fixed "make dist" script for
+           dealing with Subversion instead of CVS.
 04112008 - Check if Speex header has bogus data (CVE-2008-1686).
 08062007 - Updated my email address. Added -fvisibility=hidden support.
 07152007 - Minor correction in Timidity resampling code (Thanks, Sam!).
diff -r 8a814bbbedfa -r 95cc0ba5410f Makefile.am
--- a/Makefile.am	Thu Apr 17 18:08:02 2008 +0000
+++ b/Makefile.am	Thu Apr 17 18:12:21 2008 +0000
@@ -47,5 +47,5 @@
 	echo "Docs are generated with the program "Doxygen" (http://www.doxygen.org/)," >> $(distdir)/docs/README
 	echo " or can be read online at http://icculus.org/SDL_sound/docs/" >> $(distdir)/docs/README
 	echo >> $(distdir)/docs/README
-	rm -rf `find $(distdir) -name "CVS" -type d`
+	rm -rf `find $(distdir) -type d -name ".svn"`