aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2007-04-27 16:45:54 +0000
committerMagnus Hagander <magnus@hagander.net>2007-04-27 16:45:54 +0000
commit6cc02136a4b8fa647ac64c9791a16c0464066c1d (patch)
tree3d5a0e6f92516f1cc85c237dc69613b4b2b08246 /src
parent85a3fce996b6fc053fb9c68a845c0abd116d4064 (diff)
downloadpostgresql-6cc02136a4b8fa647ac64c9791a16c0464066c1d.tar.gz
postgresql-6cc02136a4b8fa647ac64c9791a16c0464066c1d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/Mkvcbuild.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 28266646b5e..35ccdcc4719 100644
--- 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;