support-nested-variables-20011009

necessary changes to nest variables so build directories can be changed when
installing by overriding fewer variables

diff --git a/acinclude.m4 b/acinclude.m4
index 177d384..783173a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -410,17 +410,17 @@ if test "x$enable_transarc_paths" = "xyes"  ; then
     afsbackupdir=${afsbackupdir=/usr/afs/backup}
     afsbosconfigdir=${afsbosconfigdir=/usr/afs/local}
     else 
-    afsconfdir=${afsconfdir=$sysconfdir/openafs/server}
-    viceetcdir=${viceetcdir=$sysconfdir/openafs}
-    afskerneldir=${afskerneldir=$libdir/openafs}
-    afssrvbindir=${afssrvbindir=$bindir}
-    afssrvsbindir=${afssrvsbindir=$sbindir}
-    afssrvlibexecdir=${afssrvlibexecdir=$libexecdir/openafs}
-    afsdbdir=${afsdbdir=$localstatedir/openafs/db}
-    afslogsdir=${afslogsdir=$localstatedir/openafs/logs}
-    afslocaldir=${afslocaldir=$localstatedir/openafs}
-    afsbackupdir=${afsbackupdir=$localstatedir/openafs/backup}
-    afsbosconfigdir=${afsbosconfigdir=$sysconfdir/openafs}
+    afsconfdir=${afsconfdir=\${sysconfdir\}/openafs/server}
+    viceetcdir=${viceetcdir=\${sysconfdir\}/openafs}
+    afskerneldir=${afskerneldir=\${libdir\}/openafs}
+    afssrvbindir=${afssrvbindir=\${bindir}}
+    afssrvsbindir=${afssrvsbindir=\${sbindir}}
+    afssrvlibexecdir=${afssrvlibexecdir=\${libexecdir\}/openafs}
+    afsdbdir=${afsdbdir=\${localstatedir\}/openafs/db}
+    afslogsdir=${afslogsdir=\${localstatedir\}/openafs/logs}
+    afslocaldir=${afslocaldir=\${localstatedir\}/openafs}
+    afsbackupdir=${afsbackupdir=\${localstatedir\}/openafs/backup}
+    afsbosconfigdir=${afsbosconfigdir=\${sysconfdir\}/openafs}
 
 fi
 AC_SUBST(afsconfdir)

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 5c74b37..6d4474f 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -14,6 +14,8 @@ libexecdir=@libexecdir@
 libdir=@libdir@
 includedir=@includedir@
 mandir=@mandir@
+sysconfdir=@sysconfdir@
+localstatedir=@localstatedir@
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@