Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10193/lib/Module/Build
Modified Files:
Base.pm
Log Message:
Can fairly easily eliminate the _prefixify_default() method when using relative paths
Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -d -r1.446 -r1.447
--- Base.pm 25 Jun 2005 20:31:27 -0000 1.446
+++ Base.pm 25 Jun 2005 20:40:30 -0000 1.447
@@ -2684,8 +2684,14 @@
} elsif( $sprefix eq $rprefix ) {
$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, $type);
+ $self->log_verbose(" cannot prefixify, falling back to default.\n");
+ my $default = $self->prefix_relpaths($self->installdirs, $type);
+ if( !$default ) {
+ $self->log_verbose(" no default install location for type '$type', using prefix '$rprefix'.\n");
+ return $rprefix;
+ }
+
+ return $default;
}
$self->log_verbose(" now $path\n");
@@ -2698,28 +2704,6 @@
}
-sub _prefixify_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;
- }
- if( !$rprefix ) {
- $self->log_verbose(" no replacement prefix!\n");
- return;
- }
-
- $self->log_verbose(" using default '$default'.\n");
-
- File::Spec->catdir($rprefix, $default),
-}
-
-
-
sub install_destination {
my ($self, $type) = @_;
my $p = $self->{properties};
|
