From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 12 Oct 2009 17:10:32 +0000 (+0000)
Subject: Less cargo cult madness
X-Git-Tag: 5.80014~31
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=212ba4eef702e4c181720011fbe6c61b84a6feb7;hp=448e5011e539a42791c6822a3473fb627ce6af41

Less cargo cult madness
---

diff --git a/Makefile.PL b/Makefile.PL
index 7283506..3384a3c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,13 +1,15 @@
 use strict;
 use warnings;
 use inc::Module::Install 0.87;
-BEGIN { # Make it easy for newbies
-    if ($Module::Install::AUTHOR) {
-        require Module::Install::AuthorRequires;
-        require Module::Install::CheckConflicts;
-        require Module::Install::AuthorTests;
-    }
+{   # Ensure that these get used - yes, M::I loads them for us, but if you're
+    # in author mode and don't have them installed, then the error is tres
+    # cryptic.
+    no warnings 'redefine';
+    use Module::Install::AuthorRequires;
+    use Module::Install::CheckConflicts;
+    use Module::Install::AuthorTests;
 }
+
 perl_version '5.008004';
 
 name 'Catalyst-Runtime';