X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=7c122e341b58ef9e85c3e2dd11fece0f285d7e4c;hb=a9b2fc02f563fd7812120cca1cf2dc8f59c3131e;hp=18ee344d24520b49dbf6a8a5014c220252a11931;hpb=3c5f2fc26b9ecd07dc16e24b78afdf8018615b3f;p=p5sagit%2Flocal-lib.git diff --git a/Makefile.PL b/Makefile.PL index 18ee344..7c122e3 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -259,7 +259,7 @@ else { my $value = $CPAN::Config->{$setting} or next; if ($setting =~ /^make/ ? $value =~ /(?:PREFIX|INSTALL_BASE)/ - : /(?:--prefix|--install_base)/ + : $value =~ /(?:--prefix|--install_base)/ ) { die <<"DEATH"; WHOA THERE! It looks like you've got $CPAN::Config->{$setting} set in @@ -309,8 +309,8 @@ WriteMakefile( PREREQ_PM => { %RUN_DEPS, }, - keys %BUILD_DEPS ? ( BUILD_REQUIRES => \%BUILD_DEPS ) : (), - keys %TEST_DEPS ? ( TEST_REQUIRES => \%TEST_DEPS ) : (), + BUILD_REQUIRES => \%BUILD_DEPS, + TEST_REQUIRES => \%TEST_DEPS, META_ADD => \%extra_info, META_MERGE => { no_index => {