X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=doc%2FMakefile.am;h=29d6ffdf93b3a3fdc69b0698384da48e37be4535;hp=95580cabedfc91ef32199f8e64ad184ddd5a9d31;hb=dff4955ddec1d318a56997388f367186c5b8078c;hpb=8ad5cde6f05c11fc46b727ba4dec475989167fd0

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 95580cab..29d6ffdf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,24 +1,14 @@
 ## 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.tar.gz
+EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.conf.5.in sample-config
 
 CLEANFILES = *.html tincd.8 tinc.conf.5 tincinclude.texi
 
-# Use `ginstall' in the definition of man_MANS to avoid
-# confusion with the `install' target.  The install rule transforms `ginstall'
-# to install before applying any user-specified name transformations.
-transform = s/ginstall/install/; @program_transform_name@
-
-# For additional rules usually of interest only to the maintainer,
-# see GNUmakefile and Makefile.maint.
-
-sample-config.tar.gz: $(srcdir)/sample-config
-	$(AM_V_GEN)GZIP=$(GZIP_ENV) $(AMTAR) chozf $@ --exclude .svn $<
-
 texi2html: tinc.texi
 	$(AM_V_GEN)texi2html -split=chapter $<
 
@@ -32,15 +22,14 @@ substitute = sed \
 	-e s,'@PACKAGE\@',"$(PACKAGE)",g \
 	-e s,'@VERSION\@',"$(VERSION)",g \
 	-e s,'@sysconfdir\@',"$(sysconfdir)",g \
+	-e s,'@runstatedir\@',"$(runstatedir)",g \
 	-e s,'@localstatedir\@',"$(localstatedir)",g
 
 tincd.8: $(srcdir)/tincd.8.in
-	$(AM_V_GEN)$(substitute) $< > $@
+	$(AM_V_GEN)$(substitute) $(srcdir)/tincd.8.in > $@
 
 tinc.conf.5: $(srcdir)/tinc.conf.5.in
-	$(AM_V_GEN)$(substitute) $< > $@
+	$(AM_V_GEN)$(substitute) $(srcdir)/tinc.conf.5.in > $@
 
 tincinclude.texi: $(srcdir)/tincinclude.texi.in
-	$(AM_V_GEN)$(substitute) $< > $@
-
-tinc.texi: tincinclude.texi
+	$(AM_V_GEN)$(substitute) $(srcdir)/tincinclude.texi.in > $@