diff -urN apache_1.3.23.orig/Makefile.tmpl apache_1.3.23/Makefile.tmpl
--- apache_1.3.23.orig/Makefile.tmpl	Thu Nov 29 00:02:12 2001
+++ apache_1.3.23/Makefile.tmpl	Thu Jan 31 22:44:21 2002
@@ -270,10 +270,12 @@
 	$(MKDIR) $(root)$(mandir)/man1
 	$(MKDIR) $(root)$(mandir)/man8
 	$(MKDIR) $(root)$(sysconfdir)
-	$(MKDIR) $(root)$(htdocsdir)
+	$(RM) -rf $(root)$(htdocsdir).default
+	$(MKDIR) $(root)$(htdocsdir).default
 	$(MKDIR) $(root)$(manualdir)
 	$(MKDIR) $(root)$(iconsdir)
-	$(MKDIR) $(root)$(cgidir)
+	$(RM) -rf $(root)$(cgidir).default
+	$(MKDIR) $(root)$(cgidir).default
 	$(MKDIR) $(root)$(includedir)
 	$(MKDIR) $(root)$(includedir)/xml
 	$(MKDIR) $(root)$(runtimedir)
@@ -459,32 +461,28 @@
 #   icons and distributed CGI scripts.
 install-data:
 	@echo "===> [data: Installing initial data files]"
-	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-	else \
-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir).default/"; \
 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-	fi
-	-@if [ -d $(TOP)/htdocs/manual ]; then \
+		(cd $(root)$(htdocsdir).default/ && $(TAR) -xf -); \
+		find $(root)$(htdocsdir).default/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(htdocsdir).default/ -type f -print | xargs chmod a+r ; \
 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
 		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+	if [ ! -d $(root)$(htdocsdir)/ ]; then \
+		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
 	fi
-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
-		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-	else \
 		for script in printenv test-cgi; do \
 			cat $(TOP)/cgi-bin/$${script} |\
 			sed -e 's;^#!/.*perl;#!$(PERL);' \
 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
 		done; \
+	if [ ! -d $(root)$(cgidir)/ ]; then \
+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
 	fi
 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
diff -urN apache_1.3.23.orig/config.layout apache_1.3.23/config.layout
--- apache_1.3.23.orig/config.layout	Mon Jan 14 18:39:25 2002
+++ apache_1.3.23/config.layout	Thu Jan 31 22:43:53 2002
@@ -222,23 +222,23 @@
 
 #   Solaris 8 Layout
 <Layout Solaris>
-    prefix:        /usr/apache
+    prefix:        /usr/local
     exec_prefix:   $prefix
     bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/bin
-    libexecdir:    $exec_prefix/libexec
-    mandir:        $exec_prefix/man
-    sysconfdir:    /etc/apache
-    datadir:       /var/apache
+    sbindir:       $exec_prefix/sbin
+    libexecdir:    $exec_prefix/libexec/apache
+    mandir:        $prefix/man
+    sysconfdir:    $prefix/etc/apache
+    datadir:       $prefix/www
     iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/htdocs
-    manualdir:     $htdocsdir/manual
+    htdocsdir:     $datadir/data
+    manualdir:     $prefix/share/doc/apache
     cgidir:        $datadir/cgi-bin
-    includedir:    $exec_prefix/include
-    localstatedir: $prefix
-    runtimedir:    /var/run
-    logfiledir:    $datadir/logs
-    proxycachedir: $datadir/proxy
+    includedir:    $prefix/include/apache
+    localstatedir: /var
+    runtimedir:    $localstatedir/run
+    logfiledir:    $localstatedir/log/apache
+    proxycachedir: $localstatedir/spool/apache/proxy
 </Layout>
 
 #   FreeBSD layout...
diff -urN apache_1.3.23.orig/src/include/httpd.h apache_1.3.23/src/include/httpd.h
--- apache_1.3.23.orig/src/include/httpd.h	Tue Jan 22 04:25:02 2002
+++ apache_1.3.23/src/include/httpd.h	Thu Jan 31 22:43:53 2002
@@ -103,7 +103,7 @@
 /* Set default for OS/2 file system */
 #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
 #else
-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
+#define DOCUMENT_LOCATION  "/usr/local/www/data"
 #endif
 #endif /* DOCUMENT_LOCATION */
 
@@ -242,7 +242,7 @@
 
 /* The default path for CGI scripts if none is currently set */
 #ifndef DEFAULT_PATH
-#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin"
+#define DEFAULT_PATH "/usr/local/bin:/usr/bin:/usr/ucb"
 #endif
 
 /* The path to the shell interpreter, for parsed docs */
@@ -320,7 +320,7 @@
 #elif defined(NETWARE)
 #define HARD_SERVER_LIMIT 2048
 #else
-#define HARD_SERVER_LIMIT 256
+#define HARD_SERVER_LIMIT 512
 #endif
 #endif
 
diff -urN apache_1.3.23.orig/src/support/apachectl apache_1.3.23/src/support/apachectl
--- apache_1.3.23.orig/src/support/apachectl	Tue Jan 16 02:06:34 2001
+++ apache_1.3.23/src/support/apachectl	Thu Jan 31 22:43:53 2002
@@ -82,6 +82,7 @@
 	fi
 	if kill $PID ; then
 	    echo "$0 $ARG: httpd stopped"
+	    rm $PIDFILE
 	else
 	    echo "$0 $ARG: httpd could not be stopped"
 	    ERROR=4