From f28d7a22e03e14b70ba4d407ff4e8fd8add71c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 6 Dec 2007 17:26:30 +0000
Subject: [PATCH] use variables for paths in info docs

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22191 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 doc/Makefile.am  | 21 +++++++++++++++------
 doc/heimdal.texi |  4 +++-
 doc/setup.texi   |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c7c8274ba..3fdf5563e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,21 +10,27 @@ TEXI2DVI = true # ARGH, make distcheck can't be disabled to not build dvifiles
 
 info_TEXINFOS = heimdal.texi hx509.texi
 
-
-do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
+dxy_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
 	-e 's,[@]objdir[@],.,g' \
 	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
 
 krb5.dxy: krb5.din Makefile
-	$(do_subst) < $(srcdir)/krb5.din > krb5.dxy.tmp
+	$(dxy_subst) < $(srcdir)/krb5.din > krb5.dxy.tmp
 	chmod +x krb5.dxy.tmp
 	mv krb5.dxy.tmp krb5.dxy
 
 ntlm.dxy: ntlm.din Makefile
-	$(do_subst) < $(srcdir)/ntlm.din > ntlm.dxy.tmp
+	$(dxy_subst) < $(srcdir)/ntlm.din > ntlm.dxy.tmp
 	chmod +x ntlm.dxy.tmp
 	mv ntlm.dxy.tmp ntlm.dxy
 
+texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \
+	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
+
+vars.texi: vars.tin Makefile
+	$(texi_subst) < $(srcdir)/vars.tin > vars.texi.tmp
+	chmod +x vars.texi.tmp
+	mv vars.texi.tmp vars.texi
 
 doxygen: krb5.dxy ntlm.dxy
 	doxygen krb5.dxy
@@ -41,15 +47,18 @@ heimdal_TEXINFOS = \
 	misc.texi \
 	programming.texi \
 	setup.texi \
+	vars.texi \
 	whatis.texi \
 	win2k.texi
 
 EXTRA_DIST = \
 	krb5.din \
 	ntlm.din \
-	doxytmpl.dxy
+	doxytmpl.dxy \
+	vars.tin
 
 CLEANFILES = \
 	krb5.dxy* \
-	ntlm.dxy*
+	ntlm.dxy* \
+	vars.texi*
 
diff --git a/doc/heimdal.texi b/doc/heimdal.texi
index 09da0467a..dfc25e08f 100644
--- a/doc/heimdal.texi
+++ b/doc/heimdal.texi
@@ -14,8 +14,10 @@
 @syncodeindex pg cp
 @c %**end of header
 
+@include vars.texi
+
 @set UPDATED $Date$
-@set VERSION 1.0
+@set VERSION @value{PACKAGE_VERSION}
 @set EDITION 1.0
 
 @ifinfo
diff --git a/doc/setup.texi b/doc/setup.texi
index 41219882c..f04b229cb 100644
--- a/doc/setup.texi
+++ b/doc/setup.texi
@@ -107,7 +107,7 @@ SRV-record for your realm, or your Kerberos server has DNS CNAME
 @section Creating the database
 
 The database library will look for the database in the directory
-@file{/var/heimdal}, so you should probably create that directory.
+@file{@value{dbdir}}, so you should probably create that directory.
 Make sure the directory has restrictive permissions.
 
 @example