--- Makefile.PL.old	Tue Apr 24 23:39:04 2001
+++ Makefile.PL	Fri Apr 27 00:12:54 2001
@@ -95,7 +95,7 @@
     $Apache::MyConfig::Setup{Apache_Src} ; 
 
 my $PWD = cwd;
-$ENV{APACHE_CWD} = $PWD;
+
 $ENV{PERL5LIB} = "$PWD/lib";
 
 my %SSL = (
@@ -1932,6 +1932,15 @@
 
     }
     chdir "../../../";
+
+    open(F, '>t/docs/init.pl') 
+      or die "Cannot open t/docs/init.pl: $!";
+    print F <<"END";
+#!perl
+\$Apache::Server::CWD = '$PWD';
+
+END
+  close F;
 }
 
 sub dirent_kludge {
@@ -1967,16 +1976,6 @@
 
 sub write_my_config {
     my $src = shift;
-    
-    my $string;
-    if ($win32_auto) {
-      $string =<<"EOS";
-'APACHE_INC' => '$win32_path{APACHE_INC}',
-   'APACHE_LIB' => '$win32_path{APACHE_LIB}',
-   'MODPERL_INC' => '$win32_path{MODPERL_INC}',
-   'MODPERL_LIB' => '$win32_path{MODPERL_LIB}',
-EOS
-    }
 
 # preparing and writing Configuration to Apache::MyConfig
     my %my_config = %callback_hooks;
@@ -1989,6 +1988,10 @@
         no strict 'refs';
         $my_config{$_} = ${$_} for @other_hooks;
     }
+    if ($win32_auto) {
+      $my_config{$_} = $win32_path{$_} 
+	for qw(APACHE_INC APACHE_LIB MODPERL_INC MODPERL_LIB);
+    }
 
     #need this alias for Apache::src backwards compat
     $my_config{'Apache_Src'} = $my_config{'APACHE_SRC'};
@@ -2117,7 +2120,7 @@
     }
     elsif (/ADD CPP/) {
       my $apache_inc = win32_fix_path_dsp($win32_path{APACHE_INC});
-      s!(/D "WIN32")!/I "$apache_inc" /I "$perl_inc" $1!;
+      s!(/D "WIN32")!/I "$apache_inc"  /I "$apache_inc/../os/win32" /I "$perl_inc" $1!;
       s!(/D "WIN32")!$1 /D "EAPI" ! if $win32_args{EAPI}; 
       print NEWDSP $_;
     }
--- t/conf/httpd.conf-win32.old	Sun Dec 31 16:15:24 2000
+++ t/conf/httpd.conf-win32	Thu Apr 26 23:53:06 2001
@@ -32,6 +32,8 @@
 
 PerlSetVar KeyForPerlSetVar OK
 
+PerlRequire docs/init.pl
+
 PerlRequire docs/startup.pl
 
 PerlTransHandler PerlTransHandler
--- src/modules/win32/mod_perl.dsp.old	Sun Dec 31 22:17:44 2000
+++ src/modules/win32/mod_perl.dsp	Thu Apr 26 22:52:30 2001
@@ -42,7 +42,7 @@
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "\unzipped\ap\modperl\..\apache-1.3\src\include" /I "\Perl\lib\CORE" /D "WIN32" /D "NDEBUG" /D "_WINSOCK2API_" /D "_MSWSOCK_" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "\Perl\lib\CORE" /D "WIN32" /D "NDEBUG" /D "_WINSOCK2API_" /D "_MSWSOCK_" /D "_WINDOWS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\unzipped\ap\modperl\..\apache-1.3\src\include" /I "\Perl\lib\CORE" /D "WIN32" /D "_DEBUG" /D "_WINSOCK2API_" /D "_MSWSOCK_" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\Perl\lib\CORE" /D "WIN32" /D "_DEBUG" /D "_WINSOCK2API_" /D "_MSWSOCK_" /D "_WINDOWS" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -159,7 +159,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE="\unzipped\ap\modperl\..\apache-1.3\src\Release\ApacheCore.lib"
+SOURCE=..\..\..\..\Apache\ApacheCore.lib
 # End Source File
 # Begin Source File
 
End of Patch.