X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=df1da8338d41bdf99890568f6c66a88564c566d4;hb=67341081b1a57cc8549e51a8fb1b8cd4661543c5;hp=89f64f5c9108f98dbe08e45f378ac5f135037e2e;hpb=90fb8e194373bd17b969e68c32c75f9577e43966;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 89f64f5..df1da83 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,11 +34,6 @@ install_script (qw|
     script/dbicadmin
 |);
 
-makemaker_args(
-  PMLIBDIRS => [qw(lib .generated_pod)],
-  PMLIBPARENTDIRS => [qw(lib .generated_pod)],
-);
-
 ###
 ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
 ### All of them *MUST* go to DBIx::Class::Optional::Dependencies
@@ -52,6 +47,13 @@ my $runtime_requires = {
   # being
   'DBI'                      => '1.57',
 
+  # on older versions first() leaks
+  # for the time being make it a hard dep - when we get
+  # rid of Sub::Name will revisit this (possibility is
+  # to use Devel::HideXS to force the pure-perl version
+  # or something like that)
+  'List::Util'               => '1.16',
+
   # XS (or XS-dependent) libs
   'Sub::Name'                => '0.04',
 
@@ -144,9 +146,15 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
     warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
   }
 
+  # We need the MM facilities to generate the pieces for the final MM run.
+  # Just instantiate a throaway object here
+  my $mm_proto = ExtUtils::MakeMaker->new({
+    NAME => Meta->name || die 'The Module::Install metadata must be available at this point but is not - did you rearrange the Makefile.PL...?',
+  });
+
   require File::Spec;
   # string-eval, not do(), because we need to provide the
-  # $reqs and $*_requires lexicals to the included file
+  # $mm_proto, $reqs and $*_requires lexicals to the included file
   # (some includes *do* modify $reqs above)
   for my $inc (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) {
     my $src = do { local (@ARGV, $/) = $inc; <> } or die $!;
@@ -161,7 +169,6 @@ else {
   # make sure this Makefile can not be used to make a dist
   # (without the author includes there are no meta cleanup, no sanity checks, etc)
   postamble <<EOP;
-.PHONY: nonauthor_stop_distdir_creation
 create_distdir: nonauthor_stop_distdir_creation
 nonauthor_stop_distdir_creation:
 \t\$(NOECHO) \$(ECHO) Creation of dists in non-author mode is not allowed