Update VPIT::TestHelpers to e8344578

[perl/modules/Scalar-Vec-Util.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 3f24eabbbf9e6819f4844188d86e262660fc4ba5..e08782759ac288572e9d0bc5af9903fecca15e6d 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,12 +4,11 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
+use Config;
+
 BEGIN {
- eval { require Config };
- die 'OS unsupported' if $@;
- Config->import(qw<%Config>);
- eval { require File::Spec };
- die 'OS unsupported' if $@;
+ local $@;
+ eval { require File::Spec; 1 } or die 'OS unsupported';
 }
 
 my $cc;
@@ -94,6 +93,14 @@ my %PREREQ_PM = (
  'base'     => 0,
 );
 
+my %BUILD_REQUIRES = (
+ 'Config'              => 0,
+ 'ExtUtils::MakeMaker' => 0,
+ 'File::Spec'          => 0,
+ 'Test::More'          => 0,
+ %PREREQ_PM,
+);
+
 my %META = (
  configure_requires => {
   'Config'              => 0,
@@ -101,10 +108,7 @@ my %META = (
   'File::Spec'          => 0,
  },
  build_requires => {
-  'Config'              => 0,
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  %PREREQ_PM,
+  %BUILD_REQUIRES,
  },
  dynamic_config => 1,
  resources => {
@@ -124,6 +128,7 @@ WriteMakefile(
  PL_FILES         => {},
  C                => \@C,
  @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
  MIN_PERL_VERSION => '5.006',
  META_MERGE       => \%META,
@@ -132,7 +137,7 @@ WriteMakefile(
   COMPRESS => 'gzip -9f', SUFFIX => 'gz'
  },
  clean            => {
-  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
+  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*"
  },
 );