Properly set MODULE_PATHNAME based on module name instead of incorrectly based

mhagander · mhagander · commit 6cc02136a4b8 · 2007-04-27T16:45:54.000Z
on directory name. Fixes the generation of .sql files in contrib/spi.

Per complaint from Dave Page.
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.10 2007/04/26 14:09:12 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.11 2007/04/27 16:45:54 mha Exp $
 #
 use Carp;
 use Win32;
@@ -448,7 +448,8 @@ sub GenerateContribSqlFiles
             {
                 print "Building $out from $in (contrib/$n)...\n";
                 my $cont = Project::read_file("contrib/$n/$in");
-                my $dn = $n;
+                my $dn = $out;
+                $dn =~ s/\.sql$//;
                 if ($mf =~ /^MODULE_big\s*=\s*(.*)$/m) { $dn = $1 }
                 $cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;
                 my $o;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.10 2007/04/26 14:09:12 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.11 2007/04/27 16:45:54 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -448,7 +448,8 @@ sub GenerateContribSqlFiles`
`448`	`448`	`{`
`449`	`449`	`print "Building $out from $in (contrib/$n)...\n";`
`450`	`450`	`my $cont = Project::read_file("contrib/$n/$in");`
`451`		`- my $dn = $n;`
	`451`	`+ my $dn = $out;`
	`452`	`+ $dn =~ s/\.sql$//;`
`452`	`453`	`if ($mf =~ /^MODULE_big\s=\s(.*)$/m) { $dn = $1 }`
`453`	`454`	`$cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;`
`454`	`455`	`my $o;`