Restrict overly broad searches, and fix typo, in recent fix. Per Hannes Eder.

adunstan · adunstan · commit a8da5761a3b9 · 2007-09-23T20:32:40.000Z
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.20 2007/09/22 20:38:10 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.21 2007/09/23 20:32:40 adunstan Exp $
 #
 use strict;
 use warnings;
@@ -50,7 +50,7 @@ sub Install
 									push(@$sample_files, $File::Find::name); 
 							} 
 				  }, 
-					 "../.." );
+					 "src" );
     CopySetOfFiles('config files', $sample_files , $target . '/share/');
     CopyFiles(
         'Import libraries',
@@ -81,7 +81,7 @@ sub Install
 				   [ glob ("src\\backend\\snowball\\stopwords\\*.stop") ], 
 				   $target . '/share/tsearch_data/');
     CopySetOfFiles('Dictionaries sample files', 
-				   [ glob ("src\\backend\\tsearch\\\*_sample.*" ) ], 
+				   [ glob ("src\\backend\\tsearch\\*_sample.*" ) ], 
 				   $target . '/share/tsearch_data/');
     CopyContribFiles($config,$target);
     CopyIncludeFiles($target);
@@ -424,7 +424,6 @@ sub GenerateNLSFiles
 {
     my $target = shift;
     my $nlspath = shift;
-    my $D;
 
     print "Installing NLS files...";
     EnsureDirectories($target, "share/locale");
@@ -433,7 +432,7 @@ sub GenerateNLSFiles
 						  sub { /^nls\.mk\z/s && 
 									!                                                                       push(@flist, $File::Find::name); 	
 							} 
-				  }, ".");
+				  }, "src");
     foreach (@flist)
     {
         s/nls.mk/po/;

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.20 2007/09/22 20:38:10 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.21 2007/09/23 20:32:40 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use strict;`
`9`	`9`	`use warnings;`
`@@ -50,7 +50,7 @@ sub Install`
`50`	`50`	`push(@$sample_files, $File::Find::name);`
`51`	`51`	`}`
`52`	`52`	`},`
`53`		`- "../.." );`
	`53`	`+ "src" );`
`54`	`54`	`CopySetOfFiles('config files', $sample_files , $target . '/share/');`
`55`	`55`	`CopyFiles(`
`56`	`56`	`'Import libraries',`
`@@ -81,7 +81,7 @@ sub Install`
`81`	`81`	`[ glob ("src\\backend\\snowball\\stopwords\\*.stop") ],`
`82`	`82`	`$target . '/share/tsearch_data/');`
`83`	`83`	`CopySetOfFiles('Dictionaries sample files',`
`84`		`- [ glob ("src\\backend\\tsearch\\\_sample." ) ],`
	`84`	`+ [ glob ("src\\backend\\tsearch\\_sample." ) ],`
`85`	`85`	`$target . '/share/tsearch_data/');`
`86`	`86`	`CopyContribFiles($config,$target);`
`87`	`87`	`CopyIncludeFiles($target);`
`@@ -424,7 +424,6 @@ sub GenerateNLSFiles`
`424`	`424`	`{`
`425`	`425`	`my $target = shift;`
`426`	`426`	`my $nlspath = shift;`
`427`		`- my $D;`
`428`	`427`
`429`	`428`	`print "Installing NLS files...";`
`430`	`429`	`EnsureDirectories($target, "share/locale");`
`@@ -433,7 +432,7 @@ sub GenerateNLSFiles`
`433`	`432`	`sub { /^nls\.mk\z/s &&`
`434`	`433`	`! push(@flist, $File::Find::name);`
`435`	`434`	`}`
`436`		`- }, ".");`
	`435`	`+ }, "src");`
`437`	`436`	`foreach (@flist)`
`438`	`437`	`{`
`439`	`438`	`s/nls.mk/po/;`