X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=48291b7bf7ea95db6db60aca7a31cc2a6f7f1d15;hb=367d15f8e1589aff5a4bc143ab0e958e3e311dd4;hp=f3279325d5c6d192d3fad879932fefc78f0c00e2;hpb=4f6748f101647dd3344339b19510947df6836412;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index f327932..48291b7 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -6,11 +6,11 @@ use UNIVERSAL::require;
 use Catalyst::Log;
 use Text::ASCIITable;
 use Path::Class;
-our $CATALYST_SCRIPT_GEN = 3;
+our $CATALYST_SCRIPT_GEN = 4;
 
 __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
-our $VERSION = '5.10';
+our $VERSION = '5.20';
 our @ISA;
 
 =head1 NAME
@@ -218,6 +218,8 @@ sub import {
     # Dispatcher
     $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
       if $ENV{CATALYST_DISPATCHER};
+    my $appdis = $ENV{ uc($caller) . '_DISPATCHER' };
+    $dispatcher = "Catalyst::Dispatcher::$appdis" if $appdis;
 
     $dispatcher->require;
     die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@;
@@ -231,6 +233,8 @@ sub import {
     # Engine
     $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
       if $ENV{CATALYST_ENGINE};
+    my $appeng = $ENV{ uc($caller) . '_ENGINE' };
+    $engine = "Catalyst::Engine::$appeng" if $appeng;
 
     $engine->require;
     die qq/Couldn't load engine "$engine", "$@"/ if $@;
@@ -251,7 +255,7 @@ sub import {
     my $subdir = dir($home)->subdir($append);
     for ( split '/', $name ) { $home = dir($home)->parent }
     if ( $home =~ /blib$/ ) { $home = dir($home)->parent }
-    elsif ( !-f file( $home, 'Build.PL' ) ) { $home = $subdir }
+    elsif ( !-f file( $home, 'Makefile.PL' ) ) { $home = $subdir }
 
     if ( $caller->debug ) {
         $home
@@ -309,7 +313,7 @@ sub plugin {
 
 =head1 LIMITATIONS
 
-mod_perl2 support are considered experimental and may contain bugs.
+mod_perl2 support is considered experimental and may contain bugs.
 
 =head1 SUPPORT
 
@@ -352,7 +356,7 @@ Sebastian Riedel, C<sri@oook.de>
 
 Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
 Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
-Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom, Leon Brocard,
+Gary Ashton Jones, Jesse Sheidlower, Jody Belka, Johan Lindstrom, Leon Brocard,
 Marcus Ramberg, Tatsuhiko Miyagawa and all the others who've helped.
 
 =head1 LICENSE