[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.425,1.426

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18444/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Look for a typemap in lib/

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -d -r1.425 -r1.426
--- Base.pm	13 Jun 2005 21:33:27 -0000	1.425
+++ Base.pm	13 Jun 2005 21:35:22 -0000	1.426
@@ -2829,12 +2829,19 @@
     my $xsubpp = Module::Build::ModuleInfo->find_module_by_name('ExtUtils::xsubpp')
       or die "Can't find ExtUtils::xsubpp in INC (@INC)";
     
-    my $typemap =  Module::Build::ModuleInfo->find_module_by_name('ExtUtils::typemap', \@INC);
+    my @typemaps;
+    push @typemaps, Module::Build::ModuleInfo->find_module_by_name('ExtUtils::typemap', \@INC);
+    my $lib_typemap = Module::Build::ModuleInfo->find_module_by_name('typemap', ['lib']);
+    if (defined $lib_typemap and -e $lib_typemap) {
+      push @typemaps, 'typemap';
+    }
+    my $typemaps = join ' ', map qq{-typemap "$_"}, @typemaps;
+
     my $cf = $self->{config};
     my $perl = $self->{properties}{perl};
     
     my $command = (qq{$perl "-I$cf->{installarchlib}" "-I$cf->{installprivlib}" "$xsubpp" -noprototypes } .
-		   qq{-typemap "$typemap" "$file"});
+		   qq{$typemaps "$file"});
     
     $self->log_info($command);
     my $fh = IO::File->new("> $args{outfile}") or die "Couldn't write $args{outfile}: $!";