--- src/tools/msvc/build.bat.orig	Fri Sep  8 11:49:32 2006
+++ src/tools/msvc/build.bat	Fri Sep  8 11:50:37 2006
@@ -4,7 +4,7 @@
 perl mkvcbuild.pl
 if errorlevel 1 goto :eof
 
-if exist ..\vcbuild if exist ..\src cd ..
+if exist ..\..\..\src\tools\msvc if exist ..\..\..\src cd ..\..\..
 
 if "%1" == "" msbuild pgsql.sln
 if not "%1" == "" vcbuild %1.vcproj
--- src/tools/msvc/mkvcbuild.pl.orig	Fri Sep  8 11:49:45 2006
+++ src/tools/msvc/mkvcbuild.pl	Fri Sep  8 11:52:36 2006
@@ -5,12 +5,12 @@
 use Project;
 use Solution;
 
-chdir('..') if (-d '..\vcbuild' && -d '..\src');
-die 'Must run from root directory or vcbuild directory' unless (-d 'vcbuild' && -d 'src');
-die 'Could not find config.pl' unless (-f 'vcbuild/config.pl');
+chdir('..\..\..') if (-d '..\..\..\src\tools\msvc' && -d '..\..\..\src');
+die 'Must run from root directory or vcbuild directory' unless (-d 'src/tools/msvc' && -d 'src');
+die 'Could not find config.pl' unless (-f 'src/tools/msvc/config.pl');
 
 our $config;
-require 'vcbuild/config.pl';
+require 'src/tools/msvc/config.pl';
 
 my $solution = new Solution($config);
 
--- src/tools/msvc/Project.pm.orig	Fri Sep  8 12:13:23 2006
+++ src/tools/msvc/Project.pm	Fri Sep  8 13:14:34 2006
@@ -286,13 +286,13 @@
 			my $of = $f;
 			$of =~ s/\.y$/.c/;
 			$of =~ s{^src\\pl\\plpgsql\\src\\gram.c$}{src\\pl\\plpgsql\\src\\pl_gram.c};
-			print F '><FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool" Description="Running bison on ' . $f . '" CommandLine="vcbuild\pgbison.bat ' . $f . '" AdditionalDependencies="" Outputs="' . $of . '" /></FileConfiguration></File>' . "\n";
+			print F '><FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool" Description="Running bison on ' . $f . '" CommandLine="src\tools\msvc\pgbison.bat ' . $f . '" AdditionalDependencies="" Outputs="' . $of . '" /></FileConfiguration></File>' . "\n";
 		}
 		elsif ($f =~ /\.l$/) {
 			my $of = $f;
 			$of =~ s/\.l$/.c/;
 			$of =~ s{^src\\pl\\plpgsql\\src\\scan.c$}{src\\pl\\plpgsql\\src\\pl_scan.c};
-			print F "><FileConfiguration Name=\"Debug|Win32\"><Tool Name=\"VCCustomBuildTool\" Description=\"Running flex on $f\" CommandLine=\"vcbuild\\pgflex.bat $f\" AdditionalDependencies=\"\" Outputs=\"$of\" /></FileConfiguration></File>\n";
+			print F "><FileConfiguration Name=\"Debug|Win32\"><Tool Name=\"VCCustomBuildTool\" Description=\"Running flex on $f\" CommandLine=\"src\\tools\\msvc\\pgflex.bat $f\" AdditionalDependencies=\"\" Outputs=\"$of\" /></FileConfiguration></File>\n";
 		}
 		elsif (defined($uniquefiles{$file})) {
 # File already exists, so fake a new name
@@ -362,7 +362,7 @@
 	print $f "\t<Tool Name=\"VCLibrarianTool\" OutputFile=\".\\Debug\\$self->{name}\\$self->{name}.lib\" IgnoreDefaultLibraryNames=\"libc\" />\n";
 	print $f "\t<Tool Name=\"VCResourceCompilerTool\" AdditionalIncludeDirectories=\"src\\include\" />\n";
 	if ($self->{builddef}) {
-		print $f "\t<Tool Name=\"VCPreLinkEventTool\" Description=\"Generate DEF file\" CommandLine=\"perl vcbuild\\gendef.pl debug\\$self->{name}\" />\n";
+		print $f "\t<Tool Name=\"VCPreLinkEventTool\" Description=\"Generate DEF file\" CommandLine=\"perl src\\tools\\msvc\\gendef.pl debug\\$self->{name}\" />\n";
 	}
 	print $f <<EOF;
   </Configuration>
--- src/tools/msvc/Solution.pm.orig	Fri Sep  8 12:15:06 2006
+++ src/tools/msvc/Solution.pm	Fri Sep  8 12:15:30 2006
@@ -21,8 +21,8 @@
 # Special case - if config.pl has changed, always return 1
 sub IsNewer {
 	my ($newfile, $oldfile) = @_;
-	if ($oldfile ne 'vcbuild\config.pl') {
-		return 1 if IsNewer($newfile, 'vcbuild\config.pl');
+	if ($oldfile ne 'src\tools\msvc\config.pl') {
+		return 1 if IsNewer($newfile, 'src\tools\msvc\config.pl');
 	}
 	return 1 if (!(-e $newfile));
 	my @nstat = stat($newfile);