diff options
| author | Magnus Hagander <magnus@hagander.net> | 2007-04-04 16:34:43 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2007-04-04 16:34:43 +0000 |
| commit | 8f296ebea760c54fdf42c5bb7bf1ff690953b0b0 (patch) | |
| tree | a00b4b209a7d2b90dcb8fabc842795ea97949c37 /src | |
| parent | cd3971844652cdad939d0006bd348759490dfa85 (diff) | |
| download | postgresql-8f296ebea760c54fdf42c5bb7bf1ff690953b0b0.tar.gz postgresql-8f296ebea760c54fdf42c5bb7bf1ff690953b0b0.zip | |
Don't install files for sslinfo when building without openssl.
Per Andrew Dunstan.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Install.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 3b9df5f5542..c7b18b7cf94 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -3,7 +3,7 @@ package Install; # # 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 warnings; @@ -63,7 +63,7 @@ sub Install ); GenerateConversionScript($target); GenerateTimezoneFiles($target,$conf); - CopyContribFiles($target); + CopyContribFiles($config,$target); CopyIncludeFiles($target); GenerateNLSFiles($target,$config->{nls}) if ($config->{nls}); @@ -215,6 +215,7 @@ sub GenerateTimezoneFiles sub CopyContribFiles { + my $config = shift; my $target = shift; print "Copying contrib data files..."; @@ -224,6 +225,7 @@ sub CopyContribFiles { next if ($d =~ /^\./); next unless (-f "contrib/$d/Makefile"); + next if ($d eq "sslinfo" && !defined($config->{openssl})); my $mf = read_file("contrib/$d/Makefile"); $mf =~ s{\\s*[\r\n]+}{}mg; |