[xiph-commits] r9986 - trunk/theora

[thomasvs at svn.xiph.org]

Author: thomasvs
Date: 2005-09-07 11:34:19 -0700 (Wed, 07 Sep 2005)
New Revision: 9986

Modified:
   trunk/theora/Makefile.am
   trunk/theora/autogen.sh
   trunk/theora/configure.ac
Log:
dist the debian stuff in a way that avoids the MacOSX HFS issue

Modified: trunk/theora/Makefile.am
===================================================================
--- trunk/theora/Makefile.am	2005-09-07 18:04:56 UTC (rev 9985)
+++ trunk/theora/Makefile.am	2005-09-07 18:34:19 UTC (rev 9986)
@@ -2,20 +2,24 @@
 
 AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
 
-SUBDIRS = lib include doc examples debian tests m4
+SUBDIRS = lib include doc examples tests m4
 
-EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
-	theora-uninstalled.pc.in
+# we include the whole debian/ dir in EXTRA_DIST because there's a problem
+# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
+# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
+# because of it, breaking make dist.  This works just as well.
+EXTRA_DIST = \
+	COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
+	theora-uninstalled.pc.in \
+	debian
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = theora.pc
 
 dist-hook:
-	rm -rf `find $(distdir)/macos -name CVS`
-	rm -rf `find $(distdir)/win32 -name CVS`
-	rm -rf `find $(distdir)/macos -name .svn`
+	rm -rf `find $(distdir)/debian -name .svn`
+	rm -rf `find $(distdir)/debian -name "Makefile*"`
 	rm -rf `find $(distdir)/win32 -name .svn`
-	rm -rf `find $(distdir)/doc -name .svn`
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"

Modified: trunk/theora/autogen.sh
===================================================================
--- trunk/theora/autogen.sh	2005-09-07 18:04:56 UTC (rev 9985)
+++ trunk/theora/autogen.sh	2005-09-07 18:34:19 UTC (rev 9986)
@@ -114,12 +114,6 @@
 echo "  autoconf"
 autoconf || exit 1
 
-# this search and replace hack is specifically for MacOSX where automake
-# picks up changelog in debian/ because of filesystem
-# case-not-quite-sensitivity breaking make distcheck
-perl -i.bak -p -e 's/DIST_COMMON = ChangeLog/DIST_COMMON =/g' debian/Makefile.in
-rm debian/Makefile.in.bak
-
 cd 
 cd $olddir
 $srcdir/configure --enable-maintainer-mode "$@" && echo

Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2005-09-07 18:04:56 UTC (rev 9985)
+++ trunk/theora/configure.ac	2005-09-07 18:34:19 UTC (rev 9986)
@@ -263,7 +263,6 @@
   include/Makefile include/theora/Makefile
   examples/Makefile
   doc/Makefile doc/Doxyfile
-  debian/Makefile
   tests/Makefile
   lib/Version_script
   m4/Makefile