From d3951c8699cc68822ecff92404227daea4740992 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Tue, 16 Sep 2003 21:57:49 +0000
Subject: [PATCH] further jail cleanups and the new includedir addition

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1422 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE |  1 +
 misc/jailing/jail-functions             | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 22897e2ac..1f931c2f7 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -2,6 +2,7 @@
 *) 2003-09-16 (2.0.0-rc1 - 2.0.0-rc2)
 
  - updated openssh and nmap
+ - futher jail cleanups and the new includedir addition
 
 *) 2003-09-15 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/misc/jailing/jail-functions b/misc/jailing/jail-functions
index 85661b1d4..aa601179e 100644
--- a/misc/jailing/jail-functions
+++ b/misc/jailing/jail-functions
@@ -156,16 +156,18 @@ jail_set_confopt() {
        	datadir="$prefix/share"
        	infodir="$prefix/info"
        	mandir="$prefix/man"
+	includedir="$root/include"
 
 	confopt="--prefix=$prefix"
-	confopt="$confopt --bindir=$prefix/bin"
-	confopt="$confopt --sbindir=$prefix/sbin"
-	confopt="$confopt --libdir=$prefix/lib"
-	confopt="$confopt --datadir=$prefix/share"
-	confopt="$confopt --infodir=$prefix/info"
-	confopt="$confopt --mandir=$prefix/man"
-	confopt="$confopt --sysconfdir=${prefix%/usr}/etc"
-	confopt="$confopt --localstatedir=${prefix%/usr}/var"
+	confopt="$confopt --bindir=\$bindir"
+	confopt="$confopt --sbindir=\$sbindir"
+	confopt="$confopt --libdir=\$libdir"
+	confopt="$confopt --datadir=\$datadir"
+	confopt="$confopt --infodir=\$infodir"
+	confopt="$confopt --mandir=\$mandir"
+	confopt="$confopt --sysconfdir=\$sysconfdir"
+	confopt="$confopt --localstatedir=\$localstatedir"
+	confopt="$confopt --includedir=\$includedir"
 
 	if [ "$ROCKCFG_CONFIGURE_OPTS" ] ; then
 		confopt="$confopt $ROCKCFG_CONFIGURE_OPTS"