Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15409/lib/Module/Build
Modified Files:
Base.pm
Log Message:
Avoid catting just to uncat again
Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- Base.pm 25 Jun 2005 20:40:30 -0000 1.447
+++ Base.pm 26 Jun 2005 15:16:11 -0000 1.448
@@ -2683,7 +2683,7 @@
$self->log_verbose(" path is relative, not prefixifying.\n");
} elsif( $sprefix eq $rprefix ) {
$self->log_verbose(" no new prefix.\n");
- } elsif( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) {
+ } elsif( $path !~ s{^\Q$sprefix\E\b}{}s ) {
$self->log_verbose(" cannot prefixify, falling back to default.\n");
my $default = $self->prefix_relpaths($self->installdirs, $type);
if( !$default ) {
@@ -2694,13 +2694,9 @@
return $default;
}
- $self->log_verbose(" now $path\n");
-
- # 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);
+ $self->log_verbose(" now $path in $rprefix\n");
+
+ return $path;
}
|
