Author: dagolden
Date: Mon Sep  7 19:29:29 2009
New Revision: 13288

Modified:
   Module-Build/trunk/Changes
   Module-Build/trunk/lib/Module/Build/Base.pm

Log:
Fix typemap search to use dist-level if lib-level not found


Modified: Module-Build/trunk/Changes
==============================================================================
--- Module-Build/trunk/Changes  (original)
+++ Module-Build/trunk/Changes  Mon Sep  7 19:29:29 2009
@@ -23,6 +23,9 @@
    same process) [David Golden]
  - Simplified error message on exit under use_tap_harness [suggested by
    David Wheeler]
+ - Fixed typemap search to use a dist-level typemap if a typemap is not
+   found in the directory with the *.xs file; (was manifesting as warnings
+   in Perl 5.6 tests) [David Golden]
 
  Other:
  - Replaced guts of new_from_context().  Build.PL is now executed in a

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 Mon Sep  7 19:29:29 2009
@@ -4663,7 +4663,7 @@
         'ExtUtils::typemap', \...@inc
     );
     my $lib_typemap = Module::Build::ModuleInfo->find_module_by_name(
-        'typemap', [File::Basename::dirname($file)]
+        'typemap', [File::Basename::dirname($file), File::Spec->rel2abs('.')]
     );
     push @typemaps, $lib_typemap if $lib_typemap;
     @typemaps = map {+'-typemap', $_} @typemaps;

Reply via email to