mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't install files for sslinfo when building without openssl.

Browse Source 
Per Andrew Dunstan.
This commit is contained in:
Magnus Hagander 2007-04-04 16:34:43 +00:00
parent cd39718446
commit 8f296ebea7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/msvc/Install.pm
View File

@ -3,7 +3,7 @@ package Install;
# #
# Package that provides 'make install' functionality for msvc builds # Package that provides 'make install' functionality for msvc builds
# #
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.7 2007/04/02 12:11:26 mha Exp $ # $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.8 2007/04/04 16:34:43 mha Exp $
# #
use strict; use strict;
use warnings; use warnings;
@ -63,7 +63,7 @@ sub Install
); );
GenerateConversionScript($target); GenerateConversionScript($target);
GenerateTimezoneFiles($target,$conf); GenerateTimezoneFiles($target,$conf);
CopyContribFiles($target); CopyContribFiles($config,$target);
CopyIncludeFiles($target); CopyIncludeFiles($target);
GenerateNLSFiles($target,$config->{nls}) if ($config->{nls}); GenerateNLSFiles($target,$config->{nls}) if ($config->{nls});
@ -215,6 +215,7 @@ sub GenerateTimezoneFiles
sub CopyContribFiles sub CopyContribFiles
{ {
my $config = shift;
my $target = shift; my $target = shift;
print "Copying contrib data files..."; print "Copying contrib data files...";
@ -224,6 +225,7 @@ sub CopyContribFiles
{ {
next if ($d =~ /^\./); next if ($d =~ /^\./);
next unless (-f "contrib/$d/Makefile"); next unless (-f "contrib/$d/Makefile");
next if ($d eq "sslinfo" && !defined($config->{openssl}));
my $mf = read_file("contrib/$d/Makefile"); my $mf = read_file("contrib/$d/Makefile");
$mf =~ s{\\s*[\r\n]+}{}mg; $mf =~ s{\\s*[\r\n]+}{}mg;