[svn:Module-Build] r13545 - Module-Build/trunk/lib/Module/Build

[email protected] Sun, 15 Nov 2009 16:50:05 -0800 (PST)
Newsgroups perl.module.build.checkins
Message-ID <[email protected]>
Author: dagolden
Date: Sun Nov 15 16:50:04 2009
New Revision: 13545

Modified:
   Module-Build/trunk/lib/Module/Build/Compat.pm

Log:
fix PREREQ_PM for passthrough/small style, too

Modified: Module-Build/trunk/lib/Module/Build/Compat.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/Compat.pm	(original)
+++ Module-Build/trunk/lib/Module/Build/Compat.pm	Sun Nov 15 16:50:04 2009
@@ -400,15 +400,13 @@
   my $fh = IO::File->new("< $file") or die "Can't read $file: $!";
   my $prereqs = eval do {local $/; <$fh>};
   close $fh;
-  
+
+  my %merged = _merge_prereq( $prereqs->{requires}, $prereqs->{build_requires} );
   my @prereq;
-  foreach my $section (qw/build_requires requires/) {
-    foreach (keys %{$prereqs->{$section}}) {
-      next if $_ eq 'perl';
-      push @prereq, "$_=>q[$prereqs->{$section}{$_}]";
-    }
+  foreach (sort keys %merged) {
+    next if $_ eq 'perl';
+    push @prereq, "$_=>q[$merged{$_}]";
   }
-
   return unless @prereq;
   return "#     PREREQ_PM => { " . join(", ", @prereq) . " }\n\n";
 }