[OpenAFS-devel] [PATCH] handle nesting of vars in configure.in properly

[Jeremy Katz]

The following patch modifies configure.in so that it will properly
substitute variables without expanding all of the variables.  This makes
it so that you can relocate paths properly on make install.  Originally
vs 1.2.0 but applies to 1.2.1 and current CVS with offsets.

Jeremy

diff -ur openafs-1.2.0/configure-libafs.in openafs/configure-libafs.in
--- openafs-1.2.0/configure-libafs.in	Wed Sep 12 01:03:49 2001
+++ openafs/configure-libafs.in	Wed Oct  3 23:17:57 2001
@@ -423,17 +423,17 @@
     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 -ur openafs-1.2.0/configure.in openafs/configure.in
--- openafs-1.2.0/configure.in	Wed Sep 12 01:03:49 2001
+++ openafs/configure.in	Wed Oct  3 23:15:36 2001
@@ -423,17 +423,17 @@
     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)