[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.449,1.450

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

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

Modified Files:
	Base.pm 
Log Message:
Simplify the prefix_relative() code and put the failure handling in _prefixify().


Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- Base.pm	26 Jun 2005 15:38:15 -0000	1.449
+++ Base.pm	27 Jun 2005 19:51:31 -0000	1.450
@@ -2643,11 +2643,7 @@
   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,
+  return $self->_prefixify($self->install_sets->{$installdirs}{$type},
 			   $self->original_prefix->{$installdirs}, 
 			   $type,
 			  );
@@ -2678,7 +2674,9 @@
   $self->log_verbose("  prefixify $path from $sprefix to $rprefix\n");
   
   if( length $path == 0 ) {
-    $self->log_verbose("  no path to prefixify.\n")
+    $self->log_verbose("  no path to prefixify.\n");
+    # XXX the 'return' here is not a very good failure mechanism
+    return;
   } elsif( !File::Spec->file_name_is_absolute($path) ) {
     $self->log_verbose("    path is relative, not prefixifying.\n");
   } elsif( $sprefix eq $rprefix ) {