diff -r -u Build.orig/Base.pm Build/Base.pm
--- Build.orig/Base.pm	2009-12-25 18:26:27.000000000 +0100
+++ Build/Base.pm	2010-01-07 11:33:35.108011000 +0100
@@ -394,7 +394,12 @@
 
     foreach my $d ( File::Spec->path ) {
         my $full = File::Spec->catfile( $d, $file );
-        return $full if -f $full;
+        #escape spaces as glob() takes space as a separator
+        $full =~ s/ /\\ /g;
+        #we are gonna use glob() to accept wildcards
+        foreach my $f (glob($full)) {
+          return $f if -f $f;
+        }
     }
 
     return;
Pouze v Build: Base.pm.orig
diff -r -u Build.orig/Win32_MinGW.pm Build/Win32_MinGW.pm
--- Build.orig/Win32_MinGW.pm	2009-12-25 18:26:27.000000000 +0100
+++ Build/Win32_MinGW.pm	2010-01-07 11:37:35.383085000 +0100
@@ -5,9 +5,11 @@
 use My::Build::Utility qw(awx_arch_file awx_install_arch_file
                           awx_install_arch_dir awx_arch_dir);
 use Config;
+use File::Basename;
 
 sub _find_make {
-    my( @try ) = qw(mingw32-make make);
+    my( @try ) = qw(mingw32-make gmake make);
+    push @try, $Config{gmake} if $Config{gmake};
 
     foreach my $name ( @try ) {
         foreach my $dir ( File::Spec->path ) {
@@ -88,8 +90,15 @@
 
 sub files_to_install {
     my $self = shift;
-    my $dll = 'mingwm10.dll';
-    my $dll_from = $self->awx_path_search( $dll );
+    my( @try ) = qw(mingwm10.dll libgcc_*.dll);
+    my ($dll, $dll_from);
+    foreach my $d (@try) {
+        $dll_from = $self->awx_path_search( $d );	  
+        if (defined $dll_from) {
+            $dll = basename($dll_from);
+            last;
+        }	  
+    }
 
     return ( $self->SUPER::files_to_install(),
              ( $dll_from => awx_arch_file( "rEpLaCe/lib/$dll" ) ) );
Pouze v Build: Win32_MinGW.pm.orig
