$NetBSD: patch-aa,v 1.1 2006/04/10 18:24:34 jlam Exp $

--- lib/ExtUtils/MM_Any.pm.orig	2005-04-27 16:09:47.000000000 -0400
+++ lib/ExtUtils/MM_Any.pm
@@ -1052,6 +1052,15 @@ sub init_INSTALL_from_PREFIX {
                                     : '';
     }
 
+    $self->{INSTALLSITESCRIPT} ||= '$(INSTALLSCRIPT)'
+      unless $Config{installsitescript};
+
+    unless( $Config{installvendorscript} ) {
+        $self->{INSTALLVENDORSCRIPT} ||= $Config{usevendorprefix}
+                                      ? $Config{installscript}
+                                      : '';
+    }
+
 
     my $iprefix = $Config{installprefixexp} || $Config{installprefix} || 
                   $Config{prefixexp}        || $Config{prefix} || '';
@@ -1111,6 +1120,12 @@ sub init_INSTALL_from_PREFIX {
         script      => { s => $iprefix,
                          t => 'perl',
                          d => 'bin' },
+        vendorscript => { s => $vprefix,
+                          t => 'vendor',
+                          d => 'bin' },
+        sitescript   => { s => $sprefix,
+                          t => 'site',
+                          d => 'bin' },
     );
     
     my %man_layouts =
@@ -1253,7 +1268,6 @@ sub init_INSTALL_from_INSTALLBASE {
     # Adjust for variable quirks.
     $install{INSTALLARCHLIB} ||= delete $install{INSTALLARCH};
     $install{INSTALLPRIVLIB} ||= delete $install{INSTALLLIB};
-    delete @install{qw(INSTALLVENDORSCRIPT INSTALLSITESCRIPT)};
 
     foreach my $key (keys %install) {
         $self->{$key} ||= $install{$key};
@@ -1627,7 +1641,7 @@ sub installvars {
     return qw(PRIVLIB SITELIB  VENDORLIB
               ARCHLIB SITEARCH VENDORARCH
               BIN     SITEBIN  VENDORBIN
-              SCRIPT
+              SCRIPT  SITESCRIPT  VENDORSCRIPT
               MAN1DIR SITEMAN1DIR VENDORMAN1DIR
               MAN3DIR SITEMAN3DIR VENDORMAN3DIR
              );
