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

diff --git a/Makefile.am b/Makefile.am
index 1e019643..8462e685 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,26 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+SUBDIRS =  m4 lib src doc po
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h COPYING.README
+EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
 
 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
+ stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
+ po/tinc.pot po/*.sed po/*.header po/*.sin po/Rules-quot \
+ src/.libs intl depcomp
 
 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
@@ -27,8 +29,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