[Module-build-checkins] [svn:Module-Build] r5857 - in Module-Build/trunk: . lib/Module/Build

[<ra...@cv...>]

Author: randys
Date: Thu Apr  6 03:32:57 2006
New Revision: 5857

Modified:
   Module-Build/trunk/Changes
   Module-Build/trunk/lib/Module/Build/Base.pm

Log:
Make install_types() method smarter with respect to custom install types.

Modified: Module-Build/trunk/Changes
==============================================================================
--- Module-Build/trunk/Changes	(original)
+++ Module-Build/trunk/Changes	Thu Apr  6 03:32:57 2006
@@ -2,6 +2,9 @@
 
 0.27_11
 
+ - Make install_types() method smarter with respect to custom install
+   types.
+
  - Add documentation for the install_base_relpaths() and
    prefix_relpaths() methods. Improved their usage for a public API,
    and added tests.

Modified: Module-Build/trunk/lib/Module/Build/Base.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/Base.pm	(original)
+++ Module-Build/trunk/lib/Module/Build/Base.pm	Thu Apr  6 03:32:57 2006
@@ -3554,7 +3554,18 @@
 
 sub install_types {
   my $self = shift;
-  my %types = (%{$self->install_path}, %{ $self->install_sets($self->installdirs) });
+
+  my %types;
+  if ( $self->install_base ) {
+    %types = %{$self->install_base_relpaths};
+  } elsif ( $self->prefix ) {
+    %types = %{$self->prefix_relpaths};
+  } else {
+    %types = %{$self->install_sets($self->installdirs)};
+  }
+
+  %types = (%types, %{$self->install_path});
+
   return sort keys %types;
 }