--- configure.orig	Tue Nov 13 04:07:39 2001
+++ configure	Fri Nov 16 23:32:52 2001
@@ -1084,7 +1084,7 @@
   esac
 
   # The eval makes quoting arguments work.
-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
   then :
     echo "srclib/apr configured properly"
   else
@@ -1175,7 +1175,7 @@
   esac
 
   # The eval makes quoting arguments work.
-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
   then :
     echo "srclib/apr-util configured properly"
   else
@@ -10508,7 +10508,10 @@
 EOF
 
 cat >> confdefs.h <<EOF
-#define SERVER_CONFIG_FILE "conf/$progname.conf"
+#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
 EOF
 
 cat >> confdefs.h <<EOF