X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=doc%2FMakefile.am;h=29d6ffdf93b3a3fdc69b0698384da48e37be4535;hp=79852516b29142e1d022d215cfbe3017be8ad8d1;hb=99763e34d52fcfe76b0bb9c7f3a17ace51cfdbfc;hpb=db68db4b0e0f8b776f2d3dc938fb81dac975fdd8

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 79852516..29d6ffdf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,43 +1,35 @@
 ## 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 tinc.info 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: sample-config
-	GZIP=$(GZIP_ENV) $(AMTAR) chozf sample-config.tar.gz --exclude .svn sample-config
+CLEANFILES = *.html tincd.8 tinc.conf.5 tincinclude.texi
 
 texi2html: tinc.texi
-	texi2html -split=chapter tinc.texi
+	$(AM_V_GEN)texi2html -split=chapter $<
+
+tincd.8.html: tincd.8
+	$(AM_V_GEN)w3mman2html $< > $@
 
-%.html: $(man_MANS)
-	w3mman2html $< > $@
+tinc.conf.5.html: tinc.conf.5
+	$(AM_V_GEN)w3mman2html $< > $@
 
 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: tincd.8.in
-	$(substitute) tincd.8.in > tincd.8
+tincd.8: $(srcdir)/tincd.8.in
+	$(AM_V_GEN)$(substitute) $(srcdir)/tincd.8.in > $@
 
-tinc.conf.5: tinc.conf.5.in
-	$(substitute) tinc.conf.5.in > tinc.conf.5
+tinc.conf.5: $(srcdir)/tinc.conf.5.in
+	$(AM_V_GEN)$(substitute) $(srcdir)/tinc.conf.5.in > $@
 
-tincinclude.texi: tincinclude.texi.in
-	$(substitute) tincinclude.texi.in > tincinclude.texi
-	
-tinc.texi: tincinclude.texi
+tincinclude.texi: $(srcdir)/tincinclude.texi.in
+	$(AM_V_GEN)$(substitute) $(srcdir)/tincinclude.texi.in > $@