Properly implement tinc.texi's dependency on tincinclude.texi.

With this, make distcheck succeeds even without the info-in-builddir
option to AM_INIT_AUTOMAKE.

diff --git a/configure.ac b/configure.ac
index c6b2563..8da785c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 AC_INIT([tinc], [1.0.33])
 AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc silent-rules -Wall info-in-builddir])
+AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_SILENT_RULES([yes])

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 60afb12..29d6ffd 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,12 +1,13 @@
 ## Process this file with automake to get Makefile.in
 
 info_TEXINFOS = tinc.texi
+tinc_TEXINFOS = tincinclude.texi
 
 man_MANS = tincd.8 tinc.conf.5
 
 EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.conf.5.in sample-config
 
-CLEANFILES = *.html tincd.8 tinc.conf.5 tincinclude.texi tinc.info
+CLEANFILES = *.html tincd.8 tinc.conf.5 tincinclude.texi
 
 texi2html: tinc.texi
        $(AM_V_GEN)texi2html -split=chapter $<
@@ -32,5 +33,3 @@ tinc.conf.5: $(srcdir)/tinc.conf.5.in
 
 tincinclude.texi: $(srcdir)/tincinclude.texi.in
        $(AM_V_GEN)$(substitute) $(srcdir)/tincinclude.texi.in > $@
-
-tinc.texi: tincinclude.texi