X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBuild.pm;h=d37840e3737137c43addbe90ac5858a3c7955031;hb=ab2374d3a68f4d44601813f351b38222822b7c39;hp=7b246a73788e348046262e13478fbd2e3a2b38a0;hpb=75aeff23c055c680a7293a9642f556fc253274db;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Build.pm b/lib/Catalyst/Build.pm index 7b246a7..d37840e 100644 --- a/lib/Catalyst/Build.pm +++ b/lib/Catalyst/Build.pm @@ -27,7 +27,7 @@ L extension for Catalyst. =head1 METHODS -=over4 +=over 4 =item ACTION_install @@ -55,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 ); } }