module-build-checkins

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

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

Modified Files:
	Base.pm 
Log Message:
Use the install_sets map for --prefix too

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -d -r1.427 -r1.428
--- Base.pm	16 Jun 2005 18:44:06 -0000	1.427
+++ Base.pm	19 Jun 2005 13:55:23 -0000	1.428
@@ -2575,47 +2575,20 @@
     my ($self, $type, $prefix) = @_;
     my $c = $self->{config};
 
-    my %map = (
-          core => {
-              lib     => $c->{installprivlib},
-              arch    => $c->{installarchlib},
-              bin     => $c->{installbin},
-              script  => $c->{installscript},
-              bindoc  => $c->{installman1dir},
-              libdoc  => $c->{installman3dir},
-          },
-                   
-          site => {
-              lib     => $c->{installsitelib},
-              arch    => $c->{installsitearch},
-              bin     => $c->{installsitebin},
-              script  => $c->{installscript},
-              bindoc  => $c->{installsiteman1dir},
-              libdoc  => $c->{installsiteman3dir},
-          },
-
-          vendor => {
-              lib     => $c->{installvendorlib},
-              arch    => $c->{installvendorarch},
-              bin     => $c->{installvendorbin},
-              script  => $c->{installscript},
-              bindoc  => $c->{installvendorman1dir},
-              libdoc  => $c->{installvendorman3dir},
-          },
-    );
-
+    my $map = $self->install_sets;
+    
     my $installdirs = $self->installdirs;
-    return unless exists $map{$installdirs}{$type};
+    return unless exists $map->{$installdirs}{$type};
 
     my %prefixes = (
-        core => $Config{installprefixexp} || $Config{installprefix} ||
-                $Config{prefixexp}        || $Config{prefix} || '',
-        site => $Config{siteprefixexp},
-        vendor => $Config{usevendorprefix}  ? $Config{vendorprefixexp} : '',
+        core => $c->{installprefixexp} || $c->{installprefix} ||
+                $c->{prefixexp}        || $c->{prefix} || '',
+        site => $c->{siteprefixexp},
+        vendor => $c->{usevendorprefix}  ? $c->{vendorprefixexp} : '',
     );
     $prefixes{site} ||= $prefixes{core};
 
-    return $self->prefixify($map{$installdirs}{$type}, $prefixes{$installdirs}, $prefix);
+    return $self->prefixify($map->{$installdirs}{$type}, $prefixes{$installdirs}, $prefix);
 }