[xiph-commits] r9990 - trunk/ogg

[thomasvs at svn.xiph.org]

Author: thomasvs
Date: 2005-09-07 12:04:01 -0700 (Wed, 07 Sep 2005)
New Revision: 9990

Modified:
   trunk/ogg/Makefile.am
   trunk/ogg/autogen.sh
   trunk/ogg/configure.in
Log:
get rid of the macosx hack by disting debian from toplevel Makefile.am

Modified: trunk/ogg/Makefile.am
===================================================================
--- trunk/ogg/Makefile.am	2005-09-07 18:59:31 UTC (rev 9989)
+++ trunk/ogg/Makefile.am	2005-09-07 19:04:01 UTC (rev 9990)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
 
-SUBDIRS = src include doc win32 debian
+SUBDIRS = src include doc win32
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ogg.m4
@@ -10,12 +10,18 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ogg.pc
 
+# 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 = README AUTHORS CHANGES COPYING \
 	libogg.spec libogg.spec.in \
 	ogg.m4 ogg.pc.in ogg-uninstalled.pc.in \
-	macos macosx
+	macos macosx debian
 
 dist-hook:
+	rm -rf `find $(distdir)/debian -name .svn`
+	rm -rf `find $(distdir)/debian -name "Makefile*"`
 	rm -rf `find $(distdir)/macos -name CVS`
 	rm -rf `find $(distdir)/macosx -name CVS`
 

Modified: trunk/ogg/autogen.sh
===================================================================
--- trunk/ogg/autogen.sh	2005-09-07 18:59:31 UTC (rev 9989)
+++ trunk/ogg/autogen.sh	2005-09-07 19:04:01 UTC (rev 9990)
@@ -112,10 +112,5 @@
 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 -p -e 's/DIST_COMMON = ChangeLog/DIST_COMMON =/g' debian/Makefile.in
-
 cd $olddir
 $srcdir/configure --enable-maintainer-mode "$@" && echo

Modified: trunk/ogg/configure.in
===================================================================
--- trunk/ogg/configure.in	2005-09-07 18:59:31 UTC (rev 9989)
+++ trunk/ogg/configure.in	2005-09-07 19:04:01 UTC (rev 9990)
@@ -297,7 +297,6 @@
 doc/Makefile doc/libogg/Makefile
 include/Makefile include/ogg/Makefile include/ogg/config_types.h
 win32/Makefile
-debian/Makefile
 libogg.spec
 ogg.pc
 ogg-uninstalled.pc