From 7533d6750693c41196670a728a93ac07d9b0bcde Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Apr 2006 06:02:14 +0000
Subject: [PATCH] fix Makefile to prune Subversion files from distribution

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 644a474..e51b6ee 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ PKG_DIRS = config htdocs include locale po plugins templates
 LIB_FILES = COPYING
 LIB_BASE = include/diogenes
 
-VCS_FILTER = ! -name .arch-ids ! -name CVS
+VCS_FILTER = \( -name .arch-ids -o -name CVS -o -name .svn \) -prune
 
 # global targets
 
@@ -40,7 +40,7 @@ pkg-dist: pkg-build
 	rm -rf $(PKG_DIST) $(PKG_DIST).tar.gz
 	mkdir $(PKG_DIST)
 	cp -a $(PKG_FILES) $(PKG_DIST)
-	for dir in `find $(PKG_DIRS) -type d $(VCS_FILTER)`; \
+	for dir in `find $(PKG_DIRS) $(VCS_FILTER) -o -type d -print`; \
 	do \
           mkdir -p $(PKG_DIST)/$$dir; \
 	  find $$dir -maxdepth 1 -type f -exec cp {} $(PKG_DIST)/$$dir \; ; \
@@ -57,7 +57,7 @@ lib-dist: lib-build
 	rm -rf $(LIB_DIST)
 	mkdir $(LIB_DIST)
 	cp -a $(LIB_FILES) $(LIB_DIST)
-	for dir in `cd $(LIB_BASE) && find -type d $(VCS_FILTER)`; \
+	for dir in `cd $(LIB_BASE) && find . $(VCS_FILTER) -o -type d -print`; \
 	do \
           mkdir -p $(LIB_DIST)/$$dir; \
 	  find $(LIB_BASE)/$$dir -maxdepth 1 -type f -exec cp {} $(LIB_DIST)/$$dir \; ; \
-- 
2.1.4