[xiph-commits] r10740 - trunk/ogg

[giles at svn.xiph.org]

Author: giles
Date: 2006-01-19 15:31:14 -0800 (Thu, 19 Jan 2006)
New Revision: 10740

Modified:
   trunk/ogg/Makefile.am
   trunk/ogg/README
Log:
Remove the debian subdir from distribution tarballs at the request of 
the debian maintainer.


Modified: trunk/ogg/Makefile.am
===================================================================
--- trunk/ogg/Makefile.am	2006-01-19 23:14:52 UTC (rev 10739)
+++ trunk/ogg/Makefile.am	2006-01-19 23:31:14 UTC (rev 10740)
@@ -10,22 +10,19 @@
 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 \
-	debian macos macosx win32
+	macos macosx win32
 
 dist-hook:
-	rm -rf `find $(distdir)/debian -name .svn`
-	rm -rf `find $(distdir)/debian -name "Makefile*"`
-	rm -rf `find $(distdir)/macos -name .svn`
-	rm -rf `find $(distdir)/macosx -name .svn`
-	rm -rf `find $(distdir)/win32 -name .svn`
-
+	for item in $(EXTRA_DIST); do \
+	  if test -d $$item; then \
+	    echo -n "cleaning dir $$item for distribution..."; \
+	    rm -rf `find $(distdir)/$$item -name .svn`; \
+	    echo "OK"; \
+	  fi; \
+	done
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
 

Modified: trunk/ogg/README
===================================================================
--- trunk/ogg/README	2006-01-19 23:14:52 UTC (rev 10739)
+++ trunk/ogg/README	2006-01-19 23:31:14 UTC (rev 10740)
@@ -23,14 +23,17 @@
 
 ./include       Library API headers and codebooks
 
-./debian        Rules/spec files for building Debian .deb packages
-
 ./doc           Ogg specification documents
 
 ./win32		Win32 projects and build automation
 
-./mac		MacOS 9 projects and build automation
+./macosx	MacOS X project and build files
 
+./macos		Classic MacOS 9 projects and build automation
+
+./debian        Rules/spec files for building Debian .deb packages
+		(may not be present, depending on your distribution)
+
 WHAT IS OGG?:
 
 Ogg project codecs use the Ogg bitstream format to arrange the raw,