Also remove po/Makefile.in.in, which is generated by autogen.sh.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bda83a2..c8cc84c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,19 +2,18 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat debian
+SUBDIRS = m4 intl lib src doc po redhat
 
 ACLOCAL_AMFLAGS =
 
-EXTRA_DIST = system.h ABOUT-NLS COPYING.README autogen.sh
+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 po/Makefile.in.in \
  po/tinc.pot src/.libs intl
 
 ChangeLog:
-       rm -f ChangeLog
        cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
@@ -30,3 +29,10 @@ rpm: dist
        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