--- ./configure.mdk	2002-06-25 19:40:59.000000000 +0200
+++ ./configure	2002-06-25 19:44:26.000000000 +0200
@@ -502,7 +502,7 @@
             for var in prefix exec_prefix bindir sbindir libexecdir mandir \
                        sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
                        includedir localstatedir runtimedir logfiledir \
-                       proxycachedir; do
+                       proxycachedir serverroot; do
                 eval "val=\"\$$var\""
                 case $val in
                     *+ )
@@ -663,6 +663,9 @@
             sysconfdir="$apc_optarg"    
             autosuffix_sysconfdir=no
             ;;
+	--serverroot=*)
+	    serverroot="$apc_optarg"
+	    ;;
         --datadir=*)       
             datadir="$apc_optarg"       
             autosuffix_datadir=no
@@ -1112,7 +1115,7 @@
 for var in prefix exec_prefix bindir sbindir libexecdir mandir \
            sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
            includedir localstatedir runtimedir logfiledir \
-           proxycachedir suexec_docroot suexec_logexec ; do
+           proxycachedir suexec_docroot suexec_logexec serverroot; do
     eval "val=\"\$$var\"";
     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
     eval "$var=\"$val\""
@@ -1217,8 +1220,8 @@
 ##   path is just the emtpy one, i.e. ""]
 ##
 runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
+logfiledir_relative=`echo $logfiledir | sed -e "s:^$serverroot/*::" -e 's:\(.\)$:\1/:'`
+sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$serverroot/*::" -e 's:\(.\)$:\1/:'`
 libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
 
 ##
@@ -1246,7 +1249,7 @@
     echo "        proxycachedir: $proxycachedir" 
     echo ""
     echo "Compilation paths:"
-    echo "           HTTPD_ROOT: $prefix"
+    echo "           HTTPD_ROOT: $serverroot"
     echo "      SHARED_CORE_DIR: $libexecdir"
     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
@@ -1305,6 +1308,7 @@
 -e "s%@libexecdir_relative@%$libexecdir_relative%g" \
 -e "s%@mandir@%$mandir%g" \
 -e "s%@sysconfdir@%$sysconfdir%g" \
+-e "s%@serverroot@%$serverroot%g" \
 -e "s%@datadir@%$datadir%g" \
 -e "s%@iconsdir@%$iconsdir%g" \
 -e "s%@htdocsdir@%$htdocsdir%g" \
@@ -1343,7 +1347,7 @@
 echo "#!/bin/sh" >$src/apaci
 echo "## USED AS A COMMAND LINE EXPANDER TO OVERRIDE PATHS" >>$src/apaci
 echo "## WITHOUT DISTURBING THE KNOWN MAKE BUILD PROCESS DISPLAY" >>$src/apaci
-echo "echo '-DHTTPD_ROOT=\"$prefix\"'" >>$src/apaci
+echo "echo '-DHTTPD_ROOT=\"$serverroot\"'" >>$src/apaci
 echo "echo '-DSUEXEC_BIN=\"$sbindir/suexec\"'" >>$src/apaci
 echo "echo '-DSHARED_CORE_DIR=\"$libexecdir\"'" >>$src/apaci
 echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
--- ./config.layout.mdk	2002-06-25 19:44:36.000000000 +0200
+++ ./config.layout	2002-06-25 19:48:06.000000000 +0200
@@ -28,6 +28,7 @@
     runtimedir:    $localstatedir/logs
     logfiledir:    $localstatedir/logs
     proxycachedir: $localstatedir/proxy
+    serverroot:    $prefix
 </Layout>
 
 #   GNU standards conforming path layout.
@@ -50,6 +51,7 @@
     runtimedir:    $localstatedir/run
     logfiledir:    $localstatedir/log
     proxycachedir: $localstatedir/proxy
+    serverroot:    $prefix
 </Layout>
 
 #   Apache binary distribution path layout
@@ -71,6 +73,7 @@
     runtimedir:    logs
     logfiledir:    logs
     proxycachedir: proxy
+    serverroot:    $prefix
 </Layout>
 
 #   Mac OS X Server (Rhapsody)
@@ -115,8 +118,8 @@
     proxycachedir: $runtimedir/proxy
 </Layout>
 
-#   Red Hat Linux 7.x layout
-<Layout RedHat>
+#   ADVX layout
+<Layout ADVX>
     prefix:        /usr
     exec_prefix:   $prefix
     bindir:        $prefix/bin
@@ -134,6 +137,7 @@
     runtimedir:    $localstatedir/run
     logfiledir:    $localstatedir/log/httpd
     proxycachedir: $localstatedir/cache/httpd
+    serverroot:    /etc/httpd
 </Layout>     
 
 #   According to the /opt filesystem conventions