Index: Makefile.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Makefile.in,v
retrieving revision 1.103
diff -U3 -r1.103 Makefile.in
--- Makefile.in	20 Mar 2002 16:05:33 -0000	1.103
+++ Makefile.in	3 Apr 2002 15:50:03 -0000
@@ -20,9 +20,9 @@
 	install-other install-cgi install-include install-suexec install-man \
 	install-build
 
-DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
+DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
 	modules.c config.cache config.log config.status build/config_vars.mk \
-        build/rules.mk
+        build/rules.mk docs/conf/httpd-std.conf
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
 
 include $(top_builddir)/build/rules.mk
Index: configure.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/configure.in,v
retrieving revision 1.211
diff -U3 -r1.211 configure.in
--- configure.in	21 Mar 2002 19:40:06 -0000	1.211
+++ configure.in	3 Apr 2002 15:50:04 -0000
@@ -480,7 +480,7 @@
     ;;
 esac
 
-AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
+AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
   APACHE_GEN_MAKEFILES
 ])
Index: include/ap_config.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/include/ap_config.h,v
retrieving revision 1.67
diff -U3 -r1.67 ap_config.h
--- include/ap_config.h	13 Mar 2002 20:47:42 -0000	1.67
+++ include/ap_config.h	3 Apr 2002 15:50:05 -0000
@@ -268,8 +268,8 @@
 #include "os.h"
 #if !defined(WIN32) && !defined(NETWARE)
 #include "ap_config_auto.h"
+#include "ap_config_layout.h"
 #endif
-
 
 /* TODO - We need to put OS detection back to make all the following work */
 
Index: modules/generators/mod_cgid.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/generators/mod_cgid.c,v
retrieving revision 1.125
diff -U3 -r1.125 mod_cgid.c
--- modules/generators/mod_cgid.c	30 Mar 2002 23:55:16 -0000	1.125
+++ modules/generators/mod_cgid.c	3 Apr 2002 15:50:06 -0000
@@ -149,7 +149,7 @@
 
 #define DEFAULT_LOGBYTES 10385760 
 #define DEFAULT_BUFBYTES 1024 
-#define DEFAULT_SOCKET "logs/cgisock"
+#define DEFAULT_SOCKET  DEFAULT_REL_RUNTIMEDIR "/cgisock"
 
 #define CGI_REQ 1
 #define SSI_REQ 2
Index: server/mpm/beos/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/beos/mpm_default.h,v
retrieving revision 1.8
diff -U3 -r1.8 mpm_default.h
--- server/mpm/beos/mpm_default.h	13 Mar 2002 20:48:02 -0000	1.8
+++ server/mpm/beos/mpm_default.h	3 Apr 2002 15:50:06 -0000
@@ -98,7 +98,7 @@
                    
 /* Where the main/parent process's pid is logged */
 #ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
 /*
Index: server/mpm/mpmt_os2/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/mpmt_os2/mpm_default.h,v
retrieving revision 1.3
diff -U3 -r1.3 mpm_default.h
--- server/mpm/mpmt_os2/mpm_default.h	13 Mar 2002 20:48:02 -0000	1.3
+++ server/mpm/mpmt_os2/mpm_default.h	3 Apr 2002 15:50:07 -0000
@@ -81,7 +81,7 @@
 
 /* Where the main/parent process's pid is logged */
 #ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
 /*
Index: server/mpm/netware/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/netware/mpm_default.h,v
retrieving revision 1.7
diff -U3 -r1.7 mpm_default.h
--- server/mpm/netware/mpm_default.h	13 Mar 2002 20:48:03 -0000	1.7
+++ server/mpm/netware/mpm_default.h	3 Apr 2002 15:50:07 -0000
@@ -116,15 +116,20 @@
 #define DEFAULT_MIN_FREE_THREADS 10
 #endif
 
+/* Check for definition of DEFAULT_REL_RUNTIMEDIR */
+#ifndef DEFAULT_REL_RUNTIMEDIR
+#define DEFAULT_REL_RUNTIMEDIR "logs"
+#endif
+
 /* File used for accept locking, when we use a file */
 /*#ifndef DEFAULT_LOCKFILE
-  #define DEFAULT_LOCKFILE "logs/accept.lock"
+  #define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock"
   #endif
 */
 
 /* Where the main/parent process's pid is logged */
 /*#ifndef DEFAULT_PIDLOG
-  #define DEFAULT_PIDLOG "logs/httpd.pid"
+  #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
   #endif
 */
 
Index: server/mpm/perchild/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/perchild/mpm_default.h,v
retrieving revision 1.10
diff -U3 -r1.10 mpm_default.h
--- server/mpm/perchild/mpm_default.h	13 Mar 2002 20:48:03 -0000	1.10
+++ server/mpm/perchild/mpm_default.h	3 Apr 2002 15:50:07 -0000
@@ -88,12 +88,12 @@
 
 /* File used for accept locking, when we use a file */
 #ifndef DEFAULT_LOCKFILE
-#define DEFAULT_LOCKFILE "logs/accept.lock"
+#define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock"
 #endif
 
 /* Where the main/parent process's pid is logged */
 #ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
 /*
Index: server/mpm/prefork/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/prefork/mpm_default.h,v
retrieving revision 1.9
diff -U3 -r1.9 mpm_default.h
--- server/mpm/prefork/mpm_default.h	13 Mar 2002 20:48:04 -0000	1.9
+++ server/mpm/prefork/mpm_default.h	3 Apr 2002 15:50:07 -0000
@@ -82,12 +82,12 @@
 
 /* File used for accept locking, when we use a file */
 #ifndef DEFAULT_LOCKFILE
-#define DEFAULT_LOCKFILE "logs/accept.lock"
+#define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock"
 #endif
 
 /* Where the main/parent process's pid is logged */
 #ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
 /*
Index: server/mpm/prefork/prefork.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/prefork/prefork.c,v
retrieving revision 1.259
diff -U3 -r1.259 prefork.c
--- server/mpm/prefork/prefork.c	3 Apr 2002 13:45:57 -0000	1.259
+++ server/mpm/prefork/prefork.c	3 Apr 2002 15:50:07 -0000
@@ -184,8 +184,8 @@
 /* 
  * change directory for gprof to plop the gmon.out file
  * configure in httpd.conf:
- * GprofDir logs/   -> $ServerRoot/logs/gmon.out
- * GprofDir logs/%  -> $ServerRoot/logs/gprof.$pid/gmon.out
+ * GprofDir $RuntimeDir/   -> $ServerRoot/$RuntimeDir/gmon.out
+ * GprofDir $RuntimeDir/%  -> $ServerRoot/$RuntimeDir/gprof.$pid/gmon.out
  */
 static void chdir_for_gprof(void)
 {
@@ -210,7 +210,7 @@
 	}
     }
     else {
-	use_dir = ap_server_root_relative(pconf, "logs");
+	use_dir = ap_server_root_relative(pconf, DEFAULT_REL_RUNTIMEDIR);
     }
 
     chdir(use_dir);
Index: server/mpm/winnt/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/winnt/mpm_default.h,v
retrieving revision 1.12
diff -U3 -r1.12 mpm_default.h
--- server/mpm/winnt/mpm_default.h	13 Mar 2002 20:48:04 -0000	1.12
+++ server/mpm/winnt/mpm_default.h	3 Apr 2002 15:50:07 -0000
@@ -86,9 +86,14 @@
 #define DEFAULT_NUM_DAEMON 1
 #endif
 
+/* Check for definition of DEFAULT_REL_RUNTIMEDIR */
+#ifndef DEFAULT_REL_RUNTIMEDIR
+#define DEFAULT_REL_RUNTIMEDIR "logs"
+#endif
+
 /* Where the main/parent process's pid is logged */
 #ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
 /*
Index: server/mpm/worker/mpm_default.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/worker/mpm_default.h,v
retrieving revision 1.5
diff -U3 -r1.5 mpm_default.h
--- server/mpm/worker/mpm_default.h	13 Mar 2002 20:48:05 -0000	1.5
+++ server/mpm/worker/mpm_default.h	3 Apr 2002 15:50:07 -0000
@@ -86,12 +86,12 @@
 
 /* File used for accept locking, when we use a file */
 #ifndef DEFAULT_LOCKFILE
-#define DEFAULT_LOCKFILE "logs/accept.lock"
+#define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock"
 #endif
 
 /* Where the main/parent process's pid is logged */
 #ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
 /*
Index: support/apachectl.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/apachectl.in,v
retrieving revision 1.10
diff -U3 -r1.10 apachectl.in
--- support/apachectl.in	13 Mar 2002 20:48:05 -0000	1.10
+++ support/apachectl.in	3 Apr 2002 15:50:08 -0000
@@ -26,14 +26,14 @@
 # --------------------                              --------------------
 # 
 # the path to your PID file
-PIDFILE=@prefix@/logs/@progname@.pid
+PIDFILE=@exp_runtimedir@/@progname@.pid
 #
 # the path to your httpd binary, including options if necessary
-HTTPD='@prefix@/bin/@progname@'
+HTTPD='@exp_bindir@/@progname@'
 #
 # pick up any necessary environment variables
-if test -f @prefix@/bin/envvars; then
-  . @prefix@/bin/envvars
+if test -f @exp_bindir@/envvars; then
+  . @exp_bindir@/envvars
 fi
 #
 # a command that outputs a formatted text version of the HTML at the