Gettext 1.11.5 compatibility.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c8cc84c..8462e68 100644 (file)
--- 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.in \
- po/tinc.pot src/.libs intl
+ 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