Hoopjumping to get the default directories in the manuals properly.

diff --git a/configure.in b/configure.in
index 55d0f00c3cbc8ab150dc9882c4ffaf0e58b385d8..91545da23428be80d652a4494d7a063b8ae47e29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -174,6 +174,6 @@ AC_ARG_ENABLE(tracing,
 
 AC_SUBST(INCLUDES)
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile doc/tincd.8 doc/tinc.conf.5 doc/tincinclude.texi lib/Makefile po/Makefile.in m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile po/Makefile.in m4/Makefile])
 
 AC_OUTPUT

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ba681caffce1dd1558a9e909310764481a78402a..d31e8a3dd358762c1fb2ce0c4f2029725ce15e72 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,7 +6,7 @@ man_MANS = tincd.8 tinc.conf.5
 
 EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.conf.5.in sample-config.tar.gz
 
-CLEANFILES = *.html
+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'
@@ -24,3 +24,20 @@ texi2html: tinc.texi
 
 %.html: $(man_MANS)
        w3mman2html $< > $@
+
+substitute = sed \
+       -e s,'@PACKAGE\@',"$(PACKAGE)",g \
+       -e s,'@VERSION\@',"$(VERSION)",g \
+       -e s,'@sysconfdir\@',"$(sysconfdir)",g \
+       -e s,'@localstatedir\@',"$(localstatedir)",g
+
+tincd.8: tincd.8.in
+       $(substitute) tincd.8.in > tincd.8
+
+tinc.conf.5: tinc.conf.5.in
+       $(substitute) tinc.conf.5.in > tinc.conf.5
+
+tincinclude.texi: tincinclude.texi.in
+       $(substitute) tincinclude.texi.in > tincinclude.texi
+       
+tinc.texi: tincinclude.texi