[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.365,1.366

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

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

Modified Files:
	Base.pm 
Log Message:
Some changes to install_path and install_base

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.365
retrieving revision 1.366
diff -C2 -d -r1.365 -r1.366
*** Base.pm	18 Dec 2004 21:17:12 -0000	1.365
--- Base.pm	26 Dec 2004 05:10:37 -0000	1.366
***************
*** 2485,2490 ****
    my ($self, $type) = @_;
    my %map = (
! 	     lib     => ['lib'],
! 	     arch    => ['lib', $self->{config}{archname}],
  	     bin     => ['bin'],
  	     script  => ['bin'],
--- 2485,2490 ----
    my ($self, $type) = @_;
    my %map = (
! 	     lib     => ['lib', 'perl5'],
! 	     arch    => ['lib', 'perl5', $self->{config}{archname}],
  	     bin     => ['bin'],
  	     script  => ['bin'],
***************
*** 2500,2507 ****
    my $p = $self->{properties};
    
-   if ($p->{install_base}) {
-     return File::Spec->catdir($p->{install_base}, $self->install_base_relative($type));
-   }
    return $p->{install_path}{$type} if exists $p->{install_path}{$type};
    return $p->{install_sets}{ $p->{installdirs} }{$type};
  }
--- 2500,2505 ----
    my $p = $self->{properties};
    
    return $p->{install_path}{$type} if exists $p->{install_path}{$type};
+   return File::Spec->catdir($p->{install_base}, $self->install_base_relative($type)) if $p->{install_base};
    return $p->{install_sets}{ $p->{installdirs} }{$type};
  }