X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBuild.pm;h=47be03466636033ec67d7b29319060083cc7b520;hb=41ca9ba7190b75d9ee3adebf37188309cad986a4;hp=c314ad87ebb80f23050021b90c1ca8e3485dfeca;hpb=4f6748f101647dd3344339b19510947df6836412;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Build.pm b/lib/Catalyst/Build.pm
index c314ad8..47be034 100644
--- a/lib/Catalyst/Build.pm
+++ b/lib/Catalyst/Build.pm
@@ -6,11 +6,12 @@ use base 'Module::Build';
 use Path::Class;
 use File::Find 'find';
 
+our @ignore =
+  qw/Build Build.PL Changes MANIFEST META.yml Makefile.PL Makefile README
+  _build blib lib script t/;
+
 our $FAKE;
-our $ignore = '^('
-  . join( '|',
-    qw/Build Build.PL Changes Makefile.PL README _build blib lib script t/ )
-  . ')$';
+our $ignore = '^(' . join( '|', @ignore ) . ')$';
 
 =head1 NAME
 
@@ -26,6 +27,8 @@ L<Module::Build> extension for Catalyst.
 
 =head1 METHODS
 
+=over 4
+
 =item ACTION_install
 
 =cut
@@ -52,18 +55,16 @@ sub ACTION_fakeinstall {
 =cut
 
 sub ACTION_install_extras {
-    my $self   = shift;
-    my $prefix = $self->{properties}{destdir} || '';
-    my $path   = dir(
-        $prefix,
-        $self->{config}{installsitelib},
-        split( '::', $self->{properties}{module_name} )
-    );
-    my @files = $self->_find_extras;
+    my $self    = shift;
+    my $prefix  = $self->{properties}{destdir} || undef;
+    my $sitelib = $self->install_destination('lib');
+    my @path    = defined $prefix ? ( $prefix, $sitelib ) : ($sitelib);
+    my $path    = dir( @path, split( '::', $self->{properties}{module_name} ) );
+    my @files   = $self->_find_extras;
     print "Installing extras to $path\n";
     for (@files) {
         $FAKE
-          ? print "$_ -> $path/$_ (FAKE)\n"
+          ? print "$_ -> $path (FAKE)\n"
           : $self->copy_if_modified( $_, $path );
     }
 }
@@ -96,8 +97,8 @@ Sebastian Riedel, C<sri@oook.de>
 
 =head1 LICENSE
 
-This library is free software . You can redistribute it and/or modify it under
-the same terms as perl itself.
+This library is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
 
 =cut