Skip to content

Commit 2139e85

Browse files
committed
Introduce an INST_SHARE pseudo-target
This is not a real installation directory yet, because the backend (ExtUtils::Install and %Config) don't support that yet.
1 parent 500977e commit 2139e85

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

lib/ExtUtils/MM_Any.pm

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,6 +1935,8 @@ sub init_INST {
19351935
$self->{INST_ARCHAUTODIR} = $self->catdir('$(INST_ARCHLIB)', 'auto',
19361936
'$(FULLEXT)');
19371937

1938+
$self->{INST_SHARE} ||= $self->catdir('$(INST_LIB)', 'auto', 'share');
1939+
19381940
$self->{INST_SCRIPT} ||= $self->catdir($Curdir,'blib','script');
19391941

19401942
$self->{INST_MAN1DIR} ||= $self->catdir($Curdir,'blib','man1');
@@ -2974,25 +2976,25 @@ sub sharedir {
29742976
return '' unless %share;
29752977

29762978
my %files;
2977-
_sharedir_find_files(\%files, $share{dist}, File::Spec->catdir('$(INST_LIB)', qw(auto share dist), '$(DISTNAME)'), \%share) if $share{dist};
2979+
$self->_sharedir_find_files(\%files, $share{dist}, [qw/ $(INST_SHARE) dist $(DISTNAME) /], \%share) if $share{dist};
29782980
for my $module (keys %{ $share{module} || {} }) {
2979-
my $destination = File::Spec->catdir('$(INST_LIB)', qw(auto share module), $module);
2980-
_sharedir_find_files(\%files, $share{module}{$module}, $destination, \%share);
2981+
my $destination = [ qw/$(INST_SHARE) module/, $module ];
2982+
$self->_sharedir_find_files(\%files, $share{module}{$module}, $destination, \%share);
29812983
}
29822984
my $pm_to_blib = $self->oneliner(q{pm_to_blib({@ARGV}, '$(INST_LIB)')}, ['-MExtUtils::Install']);
29832985
return "\npure_all :: sharedir\n\nsharedir : \n" . join '', map { "\t\$(NOECHO) $_\n" } $self->split_command($pm_to_blib, %files);
29842986
}
29852987

29862988
sub _sharedir_find_files {
2987-
my ($files, $source, $sink, $options) = @_;
2989+
my ($self, $files, $source, $sink, $options) = @_;
29882990
File::Find::find({
29892991
wanted => sub {
29902992
if (-d) {
29912993
$File::Find::prune = 1 if $options->{skip_dotdir} && /^\./;
29922994
return;
29932995
}
29942996
return if $options->{skip_dotfile} && /^\./;
2995-
$files->{$_} = File::Spec->catfile($sink, $_);
2997+
$files->{$_} = $self->catfile(@{$sink}, $_);
29962998
},
29972999
no_chdir => 1,
29983000
}, $source);

lib/ExtUtils/MM_Unix.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ INST_ARCHLIBDIR = $self->{INST_ARCHLIBDIR}
510510
511511
INST_AUTODIR = $self->{INST_AUTODIR}
512512
INST_ARCHAUTODIR = $self->{INST_ARCHAUTODIR}
513+
INST_SHARE = $self->{INST_SHARE}
513514
514515
INST_STATIC = $self->{INST_STATIC}
515516
INST_DYNAMIC = $self->{INST_DYNAMIC}

0 commit comments

Comments
 (0)