Don't ignore Makefile.am.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1e01964..b13689a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,14 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+SUBDIRS =  m4 lib src doc
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h COPYING.README
-
-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 \
- po/tinc.pot src/.libs intl
+EXTRA_DIST = have.h system.h COPYING.README
 
 ChangeLog:
-       cvs2cl -U cvsusers --fsf
-
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -Rf "$$f"; \
-       done
+       git log > ChangeLog
 
 deb:
        dpkg-buildpackage -rfakeroot
@@ -27,8 +17,7 @@ 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