X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=33d3290e19ffb7331aa76130b10c89c92d41df81;hb=95dcbf868547141c0b022c55cf8e79498edf12d9;hp=f4df485da4911a10d5411225efdac1cfc5b69621;hpb=84662f0d82519cb851bb79144bc4b45aa78646f5;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Makefile.PL b/Makefile.PL
index f4df485..33d3290 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,13 +15,13 @@ for ($pl, $desc) {
 my @DEFINES;
 
 print "Checking if this is an official release of perl... ";
-my $is_release = ($] < 5.011) ? (defined($pl) || defined($desc) ? 0 : 1)
-                              : (defined($desc)                 ? 0 : 1);
+my $is_release = ("$]" < 5.011) ? (defined($pl) || defined($desc) ? 0 : 1)
+                                : (defined($desc)                 ? 0 : 1);
 push @DEFINES, "-DSU_RELEASE=$is_release";
 print $is_release  ? "yes\n" : "no\n";
 
 # Threads, Windows and 5.8.x don't seem to be best friends
-if ($^O eq 'MSWin32' && $^V lt v5.9.0) {
+if ($^O eq 'MSWin32' && "$]" < 5.009) {
  push @DEFINES, '-DSU_MULTIPLICITY=0';
 }
 
@@ -40,15 +40,19 @@ my %PREREQ_PM = (
  'base'     => 0,
 );
 
+my %BUILD_REQUIRES = (
+ 'ExtUtils::MakeMaker' => 0,
+ 'Test::More'          => 0,
+ %PREREQ_PM,
+);
+
 my %META = (
  configure_requires => {
   'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
  },
  build_requires => {
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  %PREREQ_PM,
+  %BUILD_REQUIRES,
  },
  dynamic_config => 1,
  resources => {
@@ -67,15 +71,16 @@ WriteMakefile(
  ABSTRACT_FROM    => $file,
  PL_FILES         => {},
  @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
- MIN_PERL_VERSION => 5.006,
+ MIN_PERL_VERSION => '5.006',
  META_MERGE       => \%META,
  dist             => {
-  PREOP    => "pod2text $file > \$(DISTVNAME)/README",
+  PREOP    => "pod2text -u $file > \$(DISTVNAME)/README",
   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*"
  },
 );