--- Makefile.PL.in	2004-06-22 18:36:25.000000000 -0400
+++ Makefile.PL	2004-06-26 13:07:33.000000000 -0400
@@ -8,15 +8,15 @@
   $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
 }
 
-my $top_builddir = '@top_builddir@';
-my $top_srcdir = '@top_srcdir@';
+my $top_builddir = 'M:/russ/source/svn';
+my $top_srcdir = 'M:/russ/source/svn';
 my $svnlib_srcdir = "${top_srcdir}/subversion";
 my $svnlib_builddir = "${top_builddir}/subversion";
 my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
 my $swig_builddir = "${svnlib_builddir}/bindings/swig";
 
-my $swig_version = @SWIG_VERSION@;
-my $swig = '@SWIG@';
+my $swig_version = 103021;
+my $swig = 'swig';
 
 my @modules = qw/client delta fs ra repos wc/;
 my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs",
@@ -27,9 +27,9 @@
 my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
 
 my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
-my $apr_cflags = '@SVN_APR_INCLUDES@';
-my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
-my $apr_ldflags = '@SVN_APR_EXPORT_LIBS@' 
+my $apr_cflags = ' -IM:/russ/source/httpd-2.0.49/srclib/apr/include';
+my $apu_cflags = ' -IM:/russ/source/httpd-2.0.49/srclib/apr-util/include';
+my $apr_ldflags = '' 
    if $^O eq 'darwin';
 
 chomp $apr_shlib_path_var;
@@ -37,15 +37,33 @@
 my %config = (
     ABSTRACT => 'Perl bindings for Subversion',
     CCFLAGS  => join(' ', $apr_cflags, $apu_cflags, 
-                     `$perl_path -MExtUtils::Embed -e ccopts`,
+                     '-DWIN32',
                      " -I$swig_srcdir/perl/libsvn_swig_perl",
                      " -I$svnlib_srcdir/include",
                      " -I$swig_srcdir -g"),
     OBJECT => q/$(O_FILES)/,
-    LIBS => [join(' ', $apr_ldflags,
-                  (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-                  @ldmodules, '-lsvn_swig_perl-1',
-                  `$swig -perl -ldflags`)],
+    LIBS => [join(' ', ('M:/russ/source/svn/Release/subversion/bindings/swig/perl/swigpl.lib',
+                        'M:/russ/source/svn/Release/subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_client/libsvn_client-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_delta/libsvn_delta-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_diff/libsvn_diff-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_fs/libsvn_fs-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_fs_base/libsvn_fs_base-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_fs_fs/libsvn_fs_fs-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_ra/libsvn_ra-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_ra_local/libsvn_ra_local-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_repos/libsvn_repos-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_subr/libsvn_subr-1.lib',
+                        'M:/russ/source/svn/Release/subversion/libsvn_wc/libsvn_wc-1.lib',
+                        'M:/russ/source/httpd-2.0.49/srclib/apr/Release/libapr.lib',
+                        'M:/russ/source/httpd-2.0.49/srclib/apr-iconv/Release/libapriconv.lib',
+                        'M:/russ/source/httpd-2.0.49/srclib/apr-util/Release/libaprutil.lib',
+                        'M:/russ/source/httpd-2.0.49/srclib/apr-util/xml/expat/lib/LibR/xml.lib',
+                        '"K:/Program Files/Microsoft SDK/Lib/ShFolder.Lib"',
+                        'M:/russ/source/svn/neon/libneon.lib',
+                        'M:/russ/source/db4-win32/lib/libdb42.lib'))],
 );
 
 sub perlish {
@@ -76,7 +94,7 @@
    package MY ;
    
    my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
-   my $module_make_commands = join ('',map {"\tmake -f Makefile.$_\n"} @modules);
+   my $module_make_commands = join ('',map {"\tnmake -f Makefile.$_\n"} @modules);
 
    my $flags;
    if ($swig_version >= 103020) {
@@ -93,7 +111,6 @@
 
    my $swig_modules_command = join ('',
                               map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
-                                   "$svnlib_builddir/libsvn_$_/libsvn_$_-1.la ".
                                    "ra_plugin.hi ra_reporter.hi ".
                                    "delta_editor.hi\n" .
                                    "\t$swig_command -module SVN::_".