configure.in: fix AC_ARG_ENABLE and AC_ARG_WITH

[oweals/tinc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9903edaaf0189c2a7ecc5a39bbeabe921a1e9044..b13689aa35566e99a3c9fe75e84ddd600e2d3132 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,26 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS =  m4 lib src doc
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = 
-
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog
+EXTRA_DIST = have.h system.h COPYING.README
 
 ChangeLog:
-       rm -f ChangeLog
-       rcs2log -u "zarq        Ivo Timmermans  itimmermans@bigfoot.com" \
-         -u "guus      Guus Sliepen    guus@sliepen.warande.net" | \
-         sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
-
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
-       done
+       git log > ChangeLog
 
 deb:
        dpkg-buildpackage -rfakeroot
+
+rpm: dist
+       cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
+       cp redhat/tinc.spec /usr/src/redhat/SOURCES/
+       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