From: Graham Knop <haarg@haarg.org>
Date: Thu, 31 Oct 2013 19:24:18 +0000 (-0400)
Subject: avoid warnings on unset CPAN settings, and de-dupe error
X-Git-Tag: 1.008025~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=f168ffdf7864f19befb431994e3b987897a243a4

avoid warnings on unset CPAN settings, and de-dupe error
---

diff --git a/Makefile.PL b/Makefile.PL
index e0a0f2e..fae4a20 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -214,20 +214,17 @@ unless ($ENV{PERL5_CPANM_IS_RUNNING}) {
     if (!$@ ) {
         CPAN::HandleConfig->require_myconfig_or_config;
         if ( $CPAN::Config ) {
-            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
-                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+            for my $setting (qw(
+              makepl_arg make_install_arg
+              mbuild_arg mbuild_install_arg mbuildpl_arg
+            )) {
+                my $value = $CPAN::Config->{$setting} or next;
+                if ($setting =~ /^make/
+                  ? $value =~ /(?:PREFIX|INSTALL_BASE)/
+                  : /(?:--prefix|--install_base)/
+                ) {
                     die <<"DEATH";
-WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set in
-your CPAN config. This is known to cause problems with local::lib. Please
-either remove this setting or clear out your .cpan directory.
-DEATH
-                }
-            }
-
-            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
-                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
-                    die <<"DEATH";
-WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set in
+WHOA THERE! It looks like you've got $CPAN::Config->{$setting} set in
 your CPAN config. This is known to cause problems with local::lib. Please
 either remove this setting or clear out your .cpan directory.
 DEATH