From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 30 Mar 2018 09:42:43 +0000 (+0200)
Subject: Properly implement tinc.texi's dependency on tincinclude.texi.
X-Git-Tag: release-1.0.34~2
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=708777e8abf18a19a2b2f1cb978257b39e12ba0f

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 c6b2563e..8da785c1 100644
--- 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 60afb12e..29d6ffdf 100644
--- 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