[svn:Module-Build] r10957 - in Module-Build/trunk: . lib lib/Module/Build

[schwern]

Author: schwern
Date: Wed Mar 19 14:48:20 2008
New Revision: 10957

Added:
   Module-Build/trunk/lib/
      - copied from r10956, /Module-Build/trunk/lib/
Modified:
   Module-Build/trunk/   (props changed)
   Module-Build/trunk/lib/Module/Build/Base.pm

Log:
 [EMAIL PROTECTED]:  schwern | 2008-03-19 14:48:01 -0700
 Fix custom typemap finding when ExtUtils::ParseXS is not installed.


Modified: Module-Build/trunk/lib/Module/Build/Base.pm
==============================================================================
--- /Module-Build/trunk/lib/Module/Build/Base.pm        (original)
+++ Module-Build/trunk/lib/Module/Build/Base.pm Wed Mar 19 14:48:20 2008
@@ -4009,11 +4009,13 @@
       or die "Can't find ExtUtils::xsubpp in INC (@INC)";
     
     my @typemaps;
-    push @typemaps, 
Module::Build::ModuleInfo->find_module_by_name('ExtUtils::typemap', [EMAIL 
PROTECTED]);
-    my $lib_typemap = 
Module::Build::ModuleInfo->find_module_by_name('typemap', ['lib']);
-    if (defined $lib_typemap and -e $lib_typemap) {
-      push @typemaps, 'typemap';
-    }
+    push @typemaps, Module::Build::ModuleInfo->find_module_by_name(
+        'ExtUtils::typemap', [EMAIL PROTECTED]
+    );
+    my $lib_typemap = Module::Build::ModuleInfo->find_module_by_name(
+        'typemap', [File::Basename::dirname($file)]
+    );
+    push @typemaps, $lib_typemap if $lib_typemap;
     @typemaps = map {+'-typemap', $_} @typemaps;
 
     my $cf = $self->{config};