Change 26536 by rgs@stencil on 2005/12/30 12:25:24 Subject: Re: [PATCH] Re: INSTALLSCRIPT versus INSTALLDIRS From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> Date: Mon, 12 Dec 2005 19:22:32 +0100 Message-ID: <20051212192232.39cd0c1e@grubert.mandrakesoft.com> Affected files ... ... //depot/perl/lib/ExtUtils/MM_Any.pm#25 edit ... //depot/perl/lib/ExtUtils/MM_Unix.pm#207 edit ... //depot/perl/lib/ExtUtils/MakeMaker.pm#125 edit Differences ... ==== //depot/perl/lib/ExtUtils/MM_Any.pm#25 (text) ==== Index: perl/lib/ExtUtils/MM_Any.pm --- perl/lib/ExtUtils/MM_Any.pm#24~25261~ 2005-08-02 03:39:51.000000000 -0700 +++ perl/lib/ExtUtils/MM_Any.pm 2005-12-30 04:25:24.000000000 -0800 @@ -2,7 +2,7 @@ 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 @@ $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 @@ 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 @@ # 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 @@ return qw(PRIVLIB SITELIB VENDORLIB ARCHLIB SITEARCH VENDORARCH BIN SITEBIN VENDORBIN - SCRIPT + SCRIPT SITESCRIPT VENDORSCRIPT MAN1DIR SITEMAN1DIR VENDORMAN1DIR MAN3DIR SITEMAN3DIR VENDORMAN3DIR ); ==== //depot/perl/lib/ExtUtils/MM_Unix.pm#207 (text) ==== Index: perl/lib/ExtUtils/MM_Unix.pm --- perl/lib/ExtUtils/MM_Unix.pm#206~25261~ 2005-08-02 03:39:51.000000000 -0700 +++ perl/lib/ExtUtils/MM_Unix.pm 2005-12-30 04:25:24.000000000 -0800 @@ -20,7 +20,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue); -$VERSION = '1.50'; +$VERSION = '1.50_01'; require ExtUtils::MM_Any; @ISA = qw(ExtUtils::MM_Any); @@ -2074,7 +2074,7 @@ $(INST_LIB) $(DESTINSTALLSITELIB) \ $(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \ $(INST_BIN) $(DESTINSTALLSITEBIN) \ - $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ + $(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \ $(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \ $(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) $(NOECHO) $(WARN_IF_OLD_PACKLIST) \ @@ -2087,7 +2087,7 @@ $(INST_LIB) $(DESTINSTALLVENDORLIB) \ $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ $(INST_BIN) $(DESTINSTALLVENDORBIN) \ - $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ + $(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \ $(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \ $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) ==== //depot/perl/lib/ExtUtils/MakeMaker.pm#125 (text) ==== Index: perl/lib/ExtUtils/MakeMaker.pm --- perl/lib/ExtUtils/MakeMaker.pm#124~25261~ 2005-08-02 03:39:51.000000000 -0700 +++ perl/lib/ExtUtils/MakeMaker.pm 2005-12-30 04:25:24.000000000 -0800 @@ -21,7 +21,7 @@ use vars qw($Revision); use strict; -$VERSION = '6.30'; +$VERSION = '6.30_01'; ($Revision = q$Revision: 4535 $) =~ /Revision:\s+(\S+)/; @ISA = qw(Exporter); @@ -222,7 +222,7 @@ INSTALLMAN1DIR INSTALLMAN3DIR INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR INSTALLVENDORMAN1DIR INSTALLVENDORMAN3DIR - INSTALLSCRIPT + INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT PERL_LIB PERL_ARCHLIB SITELIBEXP SITEARCHEXP @@ -1084,7 +1084,7 @@ INST_ARCHLIB INSTALLARCHLIB INSTALLSITEARCH INSTALLVENDORARCH INST_LIB INSTALLPRIVLIB INSTALLSITELIB INSTALLVENDORLIB INST_BIN INSTALLBIN INSTALLSITEBIN INSTALLVENDORBIN - INST_SCRIPT INSTALLSCRIPT INSTALLSCRIPT INSTALLSCRIPT + INST_SCRIPT INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT INST_MAN1DIR INSTALLMAN1DIR INSTALLSITEMAN1DIR INSTALLVENDORMAN1DIR INST_MAN3DIR INSTALLMAN3DIR INSTALLSITEMAN3DIR INSTALLVENDORMAN3DIR @@ -1545,7 +1545,7 @@ =item INSTALLSCRIPT Used by 'make install' which copies files from INST_SCRIPT to this -directory. +directory if INSTALLDIRS=perl. =item INSTALLSITEARCH @@ -1572,6 +1572,11 @@ If set to 'none', no man pages will be installed. +=item INSTALLSITESCRIPT + +Used by 'make install' which copies files from INST_SCRIPT to this +directory if INSTALLDIRS is set to site (default). + =item INSTALLVENDORARCH Used by 'make install', which copies files from INST_ARCHLIB to this @@ -1596,6 +1601,11 @@ If set to 'none', no man pages will be installed. +=item INSTALLVENDORSCRIPT + +Used by 'make install' which copies files from INST_SCRIPT to this +directory if INSTALLDIRS is set to is set to vendor. + =item INST_ARCHLIB Same as INST_LIB for architecture dependent files. End of Patch.