Fixed installer

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Build.pm

diff --git a/lib/Catalyst/Build.pm b/lib/Catalyst/Build.pm
index 570802b..d37840e 100644 (file)
--- a/lib/Catalyst/Build.pm
+++ b/lib/Catalyst/Build.pm
@@ -27,6 +27,8 @@ L<Module::Build> extension for Catalyst.
 
 =head1 METHODS
 
+=over 4
+
 =item ACTION_install
 
 =cut
@@ -53,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 );
     }
 }