From: Sebastian Riedel <sri@labs.kraih.com>
Date: Sat, 7 May 2005 16:06:54 +0000 (+0000)
Subject: Fixed installer
X-Git-Tag: 5.7099_04~1391
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=9cee95889d823f262f505a9530c4044b0f0da485

Fixed installer
---

diff --git a/Changes b/Changes
index 95e80ca..c2cbcc5 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,7 @@ This file documents the revision history for Perl extension Catalyst.
         - allow whitespaces between brackets and quoted string
           in Path and Regex attributes
         - new helper templates
+        - installer now supports install_base and destdir
 
 5.10  Sat Apr 23 11:16:00 2005
         - updated dependencies to require latest module::pluggable::fast
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 0c22ee4..e573b0d 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -355,8 +355,8 @@ 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, Geoff Richards, Jesse Sheidlower, Jody Belka,
-Johan Lindstrom, Leon Brocard, Marcus Ramberg, Tatsuhiko Miyagawa
-and all the others who've helped.
+Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg,
+Tatsuhiko Miyagawa and all the others who've helped.
 
 =head1 LICENSE
 
diff --git a/lib/Catalyst/Build.pm b/lib/Catalyst/Build.pm
index 4f6abc7..d37840e 100644
--- a/lib/Catalyst/Build.pm
+++ b/lib/Catalyst/Build.pm
@@ -57,7 +57,7 @@ sub ACTION_fakeinstall {
 sub ACTION_install_extras {
     my $self    = shift;
     my $prefix  = $self->{properties}{destdir} || undef;
-    my $sitelib = $self->{config}{installsitelib};
+    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;