diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-12-12 20:22:32 +0100 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-12-30 12:25:24 +0000 |
| commit | 002b9267a385cf8ff0e7534241cdf3798da8636c (patch) | |
| tree | cbf96e4a39169f10eab88b81a5d902b922420356 /lib/ExtUtils/MM_Any.pm | |
| parent | 016af4f17de049a3804a577bd072125010d0388d (diff) | |
| download | perl-002b9267a385cf8ff0e7534241cdf3798da8636c.tar.gz | |
Re: [PATCH] Re: INSTALLSCRIPT versus INSTALLDIRS
Message-ID: <20051212192232.39cd0c1e@grubert.mandrakesoft.com>
p4raw-id: //depot/perl@26536
Diffstat (limited to 'lib/ExtUtils/MM_Any.pm')
| -rw-r--r-- | lib/ExtUtils/MM_Any.pm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm index 4d89b0d04b..d5d6309bc0 100644 --- a/lib/ExtUtils/MM_Any.pm +++ b/lib/ExtUtils/MM_Any.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_Any; use strict; use vars qw($VERSION @ISA); -$VERSION = '0.13'; +$VERSION = '0.13_01'; use File::Spec; BEGIN { @ISA = qw(File::Spec); } @@ -1045,12 +1045,19 @@ sub init_INSTALL_from_PREFIX { $self->{INSTALLSITEBIN} ||= '$(INSTALLBIN)' unless $Config{installsitebin}; + $self->{INSTALLSITESCRIPT} ||= '$(INSTALLSCRIPT)' + unless $Config{installsitescript}; unless( $Config{installvendorbin} ) { $self->{INSTALLVENDORBIN} ||= $Config{usevendorprefix} ? $Config{installbin} : ''; } + unless( $Config{installvendorscript} ) { + $self->{INSTALLVENDORSCRIPT} ||= $Config{usevendorprefix} + ? $Config{installscript} + : ''; + } my $iprefix = $Config{installprefixexp} || $Config{installprefix} || @@ -1111,6 +1118,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 +1266,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 +1639,7 @@ sub installvars { return qw(PRIVLIB SITELIB VENDORLIB ARCHLIB SITEARCH VENDORARCH BIN SITEBIN VENDORBIN - SCRIPT + SCRIPT SITESCRIPT VENDORSCRIPT MAN1DIR SITEMAN1DIR VENDORMAN1DIR MAN3DIR SITEMAN3DIR VENDORMAN3DIR ); |