From 4c0945d8cef6e2014b672f302dddbb3d4f486f48 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wakkerma@debian.org>
Date: Sun, 5 May 2002 20:28:42 +0000
Subject: [PATCH] Expand all paths before substitution

---
 ChangeLog              | 10 ++++++++++
 configure.in           | 27 +++++++++++++++++++++++----
 man/en/dpkg.cfg.5.sgml |  9 ++++++---
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5abce3c..2a8c2fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun May  5 22:27:50 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * configure.in: expand all paths before doing substitution
+
+Sun May  5 17:42:21 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * Makefile.conf.in: use @PACKAGE@ for dpkgconfdir as well
+  * man/paths.ent.in: new file
+  * configure.in: generate man/paths.ent
+
 Sun Apr 21 12:23:40 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
   * include/dpkg.h.in: add DIFF #define
diff --git a/configure.in b/configure.in
index d165f4c2..fa8883b5 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_ARG_WITH(admindir,
     admindir="$withval"
     ;;
  esac])
-AC_SUBST(admindir)
+
 
 AC_CHECK_TOOL_PREFIX
 AC_CANONICAL_SYSTEM
@@ -232,15 +232,34 @@ DPKG_C_GCC_TRY_WARNS(-Wsign-compare, dpkg_cv_c_gcc_comp_conv)
 DPKG_C_GCC_TRY_WARNS(-ffunction-sections -fdata-sections, dpkg_cv_func_data_sections)
 AC_SUBST(CWARNS)
 
-dnl Force this here so we can do the next step
+dnl fix up patchs. We can not use variable references paths since 
+dnl that breaks DocBook
+expandvar() { echo $(eval echo $1) ; }
+
 test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
 LLIBDIR=`eval echo $libdir`
 LLIBDIR=`eval echo $LLIBDIR`
-LOCALSTATEDIR=`eval echo $localstatedir`
+LOCALSTATEDIR="$(expandvar $localstatedir)"
 AC_DEFINE_UNQUOTED(LLIBDIR, "$LLIBDIR")
 AC_DEFINE_UNQUOTED(LOCALSTATEDIR, "$LOCALSTATEDIR")
 
+admindir=$(expandvar "$admindir")
+bindir=$(expandvar "$bindir")
+datadir=$(expandvar "$datadir")
+includedirdir=$(expandvar "$includedirdir")
+libdir=$(expandvar "$libdir")
+libexecdir=$(expandvar "$libexecdir")
+localstatedir=$(expandvar "$localstatedir")
+mandir=$(expandvar "$mandir")
+sbindir=$(expandvar "$sbindir")
+sharedstatedir=$(expandvar "$sharedstatedir")
+sysconfdir=$(expandvar "$sysconfdir")
+infodir=$(expandvar "$infodir")
+
+AC_SUBST(admindir)
+
+
 AC_OUTPUT(
 Makefile.conf
 Makefile
diff --git a/man/en/dpkg.cfg.5.sgml b/man/en/dpkg.cfg.5.sgml
index 3adad37e..a938079d 100644
--- a/man/en/dpkg.cfg.5.sgml
+++ b/man/en/dpkg.cfg.5.sgml
@@ -1,4 +1,7 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY % paths SYSTEM "../apt.ent">
+%paths
+]>
 
 <refentry id="dpkg.cfg.5">
   <refmeta>
@@ -30,7 +33,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><filename>/etc/dpkg/dpkg.cfg</filename></term>
+        <term><filename>&dpkgconfdir;/dpkg.cfg</filename></term>
 
 	<listitem>
 	  <para>
@@ -40,7 +43,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><filename>/.dpkg.cfg</filename></term>
+        <term><filename>~/.dpkg.cfg</filename></term>
 	
 	<listitem>
 	  <para>
-- 
2.39.5