Merging of the entire pre5 branch.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1e01964..bbfa014 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+SUBDIRS = m4 intl lib src doc po
 
 ACLOCAL_AMFLAGS =
 
@@ -10,14 +10,14 @@ 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 \
+ stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
  po/tinc.pot src/.libs intl
 
 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
 
@@ -27,8 +27,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