Properly set MODULE_PATHNAME based on module name instead of incorrectly based

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
index 47969b084336a4774adc08226fd0c6ba336be522..2b67362462efd2825862fbc1094fd3d9da436014 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -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;