X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=Makefile.am;h=419940ed12ff6fe35d99de222482cfe8f412b622;hp=bda83a25d980e233ef82d8175c781c752f16e31a;hb=fcd836c609568fab323f4af6dd525de957a6f4cc;hpb=603781831f251d2e8111e8282d8e624b8e40b175

diff --git a/Makefile.am b/Makefile.am
index bda83a2..419940e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,25 +2,26 @@
 
 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 COPYING.README autogen.sh
+EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
+CVS_CREATED = ABOUT-NLS INSTALL COPYING 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
+ stamp-h.in ChangeLog po/Makefile.in.in \
+ po/tinc.pot po/*.sed po/*.header po/*.sin po/Rules-quot \
+ src/.libs intl depcomp
 
 ChangeLog:
-	rm -f ChangeLog
 	cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
+	for f in $(CVS_CREATED) `find . -name Makefile.in` tinc-$(VERSION).tar.gz; do\
 	  rm -Rf "$$f"; \
 	done
+	grep -l gettext `find m4 -type f` | xargs rm -f
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -28,5 +29,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