X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=1e01964364314bcdfb890bf94adc5906b9375960;hp=8ecab33063e07db800c81c28ede34b40d5533249;hb=77f635e871060f63c3e62fcf879d184326c690a4;hpb=b200b0d812763563dbe09e5da116c55e45f89e4f

diff --git a/Makefile.am b/Makefile.am
index 8ecab330..1e019643 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,37 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS = m4 intl lib src doc po redhat
 
 ACLOCAL_AMFLAGS =
 
-EXTRA_DIST = system.h ABOUT-NLS
+EXTRA_DIST = system.h COPYING.README
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
+CVS_CREATED = ABOUT-NLS configure aclocal.m4 config.h.in config.guess \
  config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog
+ stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in \
+ po/tinc.pot src/.libs intl
 
 ChangeLog:
-	rm -f ChangeLog
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" \
-	  -u "guus	Guus Sliepen	guus@sliepen.warande.net" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+	cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
 	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
+	  rm -Rf "$$f"; \
 	done
 
 deb:
 	dpkg-buildpackage -rfakeroot
+
+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
+
+release:
+	rm -f ChangeLog
+	$(MAKE) ChangeLog
+	echo "Please edit the NEWS file now..."
+	/usr/bin/editor NEWS
+	$(MAKE) dist