Don't include .svn directory in sample configuration.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 68331c7..306a0ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,17 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat debian
+SUBDIRS =  m4 lib src doc po
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h ABOUT-NLS
-
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog
+EXTRA_DIST = config.rpath mkinstalldirs have.h system.h COPYING.README depcomp
 
 ChangeLog:
-       rm -f ChangeLog
-       cvs2cl -U cvsusers --fsf
+       svn log > ChangeLog
 
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
-       done
+svn-clean: maintainer-clean
+       svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
 
 deb:
        dpkg-buildpackage -rfakeroot
@@ -27,5 +20,11 @@ deb:
 rpm: dist
        cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
        cp redhat/tinc.spec /usr/src/redhat/SOURCES/
-       cd /usr/src/redhat/SOURCES/
-       rpm -bi tinc.spec
+       cd /usr/src/redhat/SOURCES/ && rpm -bb tinc.spec
+
+release:
+       rm -f ChangeLog
+       $(MAKE) ChangeLog
+       echo "Please edit the NEWS file now..."
+       /usr/bin/editor NEWS
+       $(MAKE) dist