From e5b5739a2d8da002d1e4c1795997b6d92d21f588 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Mon, 24 Sep 2007 21:42:34 +0000
Subject: [PATCH] Use proper search for contrib makefiles in vcregress.pl

---
 src/tools/msvc/vcregress.pl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 0ec34e07a7..6a357a0235 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -1,7 +1,7 @@
 
 # -*-perl-*- hey - emacs - this is a perl file
 
-# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.2 2007/09/24 21:14:54 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.3 2007/09/24 21:42:34 adunstan Exp $
 
 use strict;
 
@@ -188,7 +188,9 @@ sub contribcheck
     my $mstat = 0;
     foreach my $module (glob("*"))
     {
-        next unless -d "$module/sql" && -d "$module/expected" && -f "Makefile";
+        next unless -d "$module/sql" && 
+			-d "$module/expected" && 
+			(-f "$module/Makefile" || -f "$module/GNUmakefile");
         chdir $module;
 		print "============================================================\n";
         print "Checking $module\n";
@@ -211,7 +213,7 @@ sub fetchTests
 
     my $handle;
     open($handle,"<Makefile")
-      || open($handle,"<GNUMakefile")
+      || open($handle,"<GNUmakefile")
       || die "Could not open Makefile";
     local($/) = undef;
     my $m = <$handle>;