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

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

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

Modified Files:
	Base.pm 
Log Message:
Rename prefix_sets to original_prefix.

Make prefix_relative() return a relative path, just like
install_base_relative().  This helps the caller see in
install_destination() that the result is guaranteed to be inside the
specified prefix directory.



Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -d -r1.443 -r1.444
--- Base.pm	23 Jun 2005 02:44:52 -0000	1.443
+++ Base.pm	23 Jun 2005 04:35:46 -0000	1.444
@@ -203,14 +203,14 @@
 	       },
     };
 
-  $p->{prefix_sets} =
+  $p->{original_prefix} =
     {
      core   => $c->{installprefixexp} || $c->{installprefix} ||
                $c->{prefixexp}        || $c->{prefix} || '',
      site   => $c->{siteprefixexp},
      vendor => $c->{usevendorprefix} ? $c->{vendorprefixexp} : '',
     };
-  $p->{prefix_sets}{site} ||= $p->{prefix_sets}{core};
+  $p->{original_prefix}{site} ||= $p->{original_prefix}{core};
 
   $p->{install_base_relpaths} =
     {
@@ -542,7 +542,7 @@
    has_config_data
    install_sets
    install_base_relpaths
-   prefix_sets
+   original_prefix
    prefix_relpaths
    install_base
    destdir
@@ -2642,12 +2642,13 @@
 sub prefix_relative {
   my ($self, $type) = @_;
   my $installdirs = $self->installdirs;
-  
+
+  # XXX the 'return' here is not a very good failure mechanism
   my $normal_location = $self->install_sets->{$installdirs}{$type}
     or return;
   
   return $self->_prefixify($normal_location,
-			   $self->prefix_sets->{$installdirs}, 
+			   $self->original_prefix->{$installdirs}, 
 			   $self->prefix,
 			   $self->prefix_relpaths($installdirs, $type),
 			  );
@@ -2689,7 +2690,11 @@
   
   $self->log_verbose("    now $path\n");
   
-  return $path;
+  # Return a path relative to $rprefix (this is kind of silly for now,
+  # because the caller is just going to cat them back together again,
+  # but prefix_relative() and install_base_relative() should have the
+  # same interface).
+  return File::Spec->abs2rel($path, $rprefix);
 }
 
 
@@ -2720,7 +2725,7 @@
   
   return $p->{install_path}{$type} if exists $p->{install_path}{$type};
   return File::Spec->catdir($p->{install_base}, $self->install_base_relpaths($type)) if $p->{install_base};
-  return $self->prefix_relative($type) if $p->{prefix};
+  return File::Spec->catdir($p->{prefix}, $self->prefix_relative($type)) if $p->{prefix};
   return $p->{install_sets}{ $p->{installdirs} }{$type};
 }