[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.444,1.445

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5037/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Don't compute the default path relative to the prefix until we need to do so

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -d -r1.444 -r1.445
--- Base.pm	23 Jun 2005 04:35:46 -0000	1.444
+++ Base.pm	25 Jun 2005 20:29:18 -0000	1.445
@@ -2650,7 +2650,7 @@
   return $self->_prefixify($normal_location,
 			   $self->original_prefix->{$installdirs}, 
 			   $self->prefix,
-			   $self->prefix_relpaths($installdirs, $type),
+			   $type,
 			  );
 }
 
@@ -2671,7 +2671,7 @@
 
 # Translated from ExtUtils::MM_Unix::prefixify()
 sub _prefixify {
-  my($self, $path, $sprefix, $rprefix, $default) = @_;
+  my($self, $path, $sprefix, $rprefix, $type) = @_;
   
   $rprefix .= '/' if $sprefix =~ m|/$|;
   
@@ -2685,7 +2685,7 @@
     $self->log_verbose("  no new prefix.\n");
   } elsif( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) {
     $self->log_verbose("    cannot prefixify.\n");
-    $path = $self->_prefixify_default($rprefix, $default);
+    $path = $self->_prefixify_default($rprefix, $type);
   }
   
   $self->log_verbose("    now $path\n");
@@ -2699,10 +2699,11 @@
 
 
 sub _prefixify_default {
-  my($self, $rprefix, $default) = @_;
-  
+  my($self, $rprefix, $type) = @_;
   $self->log_verbose("    cannot prefix, trying default.\n");
   
+  my $default = $self->prefix_relpaths($self->installdirs, $type),
+  
   if( !$default ) {
     $self->log_verbose("    no default!  Using prefix '$rprefix'.\n");  
     return $rprefix;