[xiph-commits] r10742 - trunk/vorbis

[giles at svn.xiph.org]

Author: giles
Date: 2006-01-19 15:52:26 -0800 (Thu, 19 Jan 2006)
New Revision: 10742

Modified:
   trunk/vorbis/Makefile.am
Log:
Remove the debian subdirectory from the distribution target at the
request of the debian maintainer.


Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2006-01-19 23:50:25 UTC (rev 10741)
+++ trunk/vorbis/Makefile.am	2006-01-19 23:52:26 UTC (rev 10742)
@@ -10,10 +10,6 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.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 = \
 	todo.txt autogen.sh \
 	libvorbis.spec libvorbis.spec.in \
@@ -22,17 +18,19 @@
 	vorbis-uninstalled.pc.in \
 	vorbisenc-uninstalled.pc.in \
 	vorbisfile-uninstalled.pc.in \
-	debian macos macosx win32
+	macos macosx win32
 
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 
 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 $$item dir for distribution..."; \
+	    rm -rf `find $(distdir)/$$item -name .svn`; \
+	    echo "OK"; \
+	  fi; \
+	done
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"