diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Module/Build/Platform/VMS.pm')
-rw-r--r-- | Master/tlpkg/tlperl/lib/Module/Build/Platform/VMS.pm | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/Master/tlpkg/tlperl/lib/Module/Build/Platform/VMS.pm b/Master/tlpkg/tlperl/lib/Module/Build/Platform/VMS.pm index 7ff7e056bdc..5b06baa5f87 100644 --- a/Master/tlpkg/tlperl/lib/Module/Build/Platform/VMS.pm +++ b/Master/tlpkg/tlperl/lib/Module/Build/Platform/VMS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::VMS; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4205'; $VERSION = eval $VERSION; use Module::Build::Base; use Config; @@ -279,30 +279,6 @@ sub oneliner { return "MCR $^X $oneliner"; } -=item _infer_xs_spec - -Inherit the standard version but tweak the library file name to be -something Dynaloader can find. - -=cut - -sub _infer_xs_spec { - my $self = shift; - my $file = shift; - - my $spec = $self->SUPER::_infer_xs_spec($file); - - # Need to create with the same name as DynaLoader will load with. - if (defined &DynaLoader::mod2fname) { - my $file = $$spec{module_name} . '.' . $self->{config}->get('dlext'); - $file =~ tr/:/_/; - $file = DynaLoader::mod2fname([$file]); - $$spec{lib_file} = File::Spec->catfile($$spec{archdir}, $file); - } - - return $spec; -} - =item rscan_dir Inherit the standard version but remove dots at end of name. @@ -427,26 +403,15 @@ sub _detildefy { my @hdirs = File::Spec::Unix->splitdir($hdir); my @dirs = File::Spec::Unix->splitdir($dir); - my $newdirs; - - # Two cases of tilde handling - if ($arg =~ m#^~/#) { - - # Simple case, just merge together - $newdirs = File::Spec::Unix->catdir(@hdirs, @dirs); - - } else { - - # Complex case, need to add an updir - No delimiters - my @backup = File::Spec::Unix->splitdir(File::Spec::Unix->updir); - - $newdirs = File::Spec::Unix->catdir(@hdirs, @backup, @dirs); + unless ($arg =~ m#^~/#) { + # There is a home directory after the tilde, but it will already + # be present in in @hdirs so we need to remove it by from @dirs. + shift @dirs; } + my $newdirs = File::Spec::Unix->catdir(@hdirs, @dirs); - # Now put the two cases back together $arg = File::Spec::Unix->catpath($hvol, $newdirs, $file); - } return $arg; |