From 804b2892a5e26a2dc46d19397cc8b321b43b8add Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 8 Nov 2004 22:03:28 +0000 Subject: [PATCH] Hoopjumping to get the default directories in the manuals properly. --- configure.in | 2 +- doc/Makefile.am | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 55d0f00..91545da 100644 --- 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 ba681ca..d31e8a3 100644 --- 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 -- 2.25.1