--- support/apachectl.in.orig	Wed Oct 10 23:17:05 2001
+++ support/apachectl.in	Mon Nov 19 10:23:20 2001
@@ -25,10 +25,10 @@
 # --------------------                              --------------------
 # 
 # the path to your PID file
-PIDFILE=@prefix@/logs/@progname@.pid
+PIDFILE=/var/run/@progname@.pid
 #
 # the path to your httpd binary, including options if necessary
-HTTPD='@prefix@/bin/@progname@'
+HTTPD='@sbindir@/@progname@'
 #
 # a command that outputs a formatted text version of the HTML at the
 # url given on the command line.  Designed for lynx, however other
--- support/apxs.in.orig	Sun Sep 23 20:01:15 2001
+++ support/apxs.in	Fri Nov 16 19:07:56 2001
@@ -79,7 +79,7 @@
 my $libexecdir     = get_vars("libexecdir");
 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
 my $bindir         = get_vars("bindir");
-my $CFG_SBINDIR    = eval qq("$bindir");
+my $CFG_SBINDIR    = eval qq("@sbindir@");
 
 my %internal_vars = map {$_ => 1}
     qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
@@ -218,7 +218,7 @@
 ##
 ##  Initial shared object support check
 ##
-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
+my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
 $httpd = eval qq("$httpd");
 $httpd = eval qq("$httpd");
 
 
--- docs/conf/httpd-std.conf.orig	Fri Nov 16 08:37:13 2001
+++ docs/conf/httpd-std.conf	Fri Nov 16 08:37:35 2001
@@ -963,9 +963,9 @@
 #
 # Bring in additional module-specific configurations
 #
-<IfModule mod_ssl.c>
+<IfDefine HAVE_SSL>
     Include conf/ssl.conf
-</IfModule>
+</IfDefine>
 
 
 ### Section 3: Virtual Hosts
--- Makefile.in.orig	Thu Nov 22 00:36:09 2001
+++ Makefile.in	Thu Nov 22 00:37:01 2001
@@ -95,8 +95,8 @@
 	@echo Installing HTML documents
 	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
 	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
+	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
+	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
 	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-error: