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 216f271f68afe075cf43247f9b5b5c49eca639ff..faaa1a306ad4d3eaa4a6edbd2e8e2559dc934baf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ origcflags="$CFLAGS"
 AC_PREREQ(2.61)
 AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//'))
 AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall info-in-builddir])
+AM_INIT_AUTOMAKE([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 b2bcb4ee3a0b4f6e890cb15dfd7aa3c6767caee0..e5f3a041ea7bf14a916d9b6d4238bbc3caf159da 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.8 tinc.conf.5 tinc-gui.8
 
 EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.8.in tinc.conf.5.in tinc-gui.8.in sample-config
 
-CLEANFILES = *.html tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi tinc.info
+CLEANFILES = *.html tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
 
 tincd.8.html: tincd.8
        $(AM_V_GEN)w3mman2html $? > $@
@@ -41,5 +42,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