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

mhagander · mhagander · commit 8f296ebea760 · 2007-04-04T16:34:43.000Z
Per Andrew Dunstan.
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Install;`
`3`	`3`	`#`
`4`	`4`	`# Package that provides 'make install' functionality for msvc builds`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.7 2007/04/02 12:11:26 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.8 2007/04/04 16:34:43 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use strict;`
`9`	`9`	`use warnings;`
`@@ -63,7 +63,7 @@ sub Install`
`63`	`63`	`);`
`64`	`64`	`GenerateConversionScript($target);`
`65`	`65`	`GenerateTimezoneFiles($target,$conf);`
`66`		`- CopyContribFiles($target);`
	`66`	`+ CopyContribFiles($config,$target);`
`67`	`67`	`CopyIncludeFiles($target);`
`68`	`68`
`69`	`69`	`GenerateNLSFiles($target,$config->{nls}) if ($config->{nls});`
`@@ -215,6 +215,7 @@ sub GenerateTimezoneFiles`
`215`	`215`
`216`	`216`	`sub CopyContribFiles`
`217`	`217`	`{`
	`218`	`+ my $config = shift;`
`218`	`219`	`my $target = shift;`
`219`	`220`
`220`	`221`	`print "Copying contrib data files...";`
`@@ -224,6 +225,7 @@ sub CopyContribFiles`
`224`	`225`	`{`
`225`	`226`	`next if ($d =~ /^\./);`
`226`	`227`	`next unless (-f "contrib/$d/Makefile");`
	`228`	`+ next if ($d eq "sslinfo" && !defined($config->{openssl}));`
`227`	`229`
`228`	`230`	`my $mf = read_file("contrib/$d/Makefile");`
`229`	`231`	`$mf =~ s{\\s*[\r\n]+}{}mg;`