diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-05-09 16:34:11 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-05-09 16:34:11 +0000 |
| commit | 298537ea8b73f2f771f1ac3f0e023ce67afb2dec (patch) | |
| tree | 9791534281d3cd545f1aaa4924b47c5462701750 /gnu/usr.bin/perl/lib | |
| parent | 65c685cc9e31308678e954366ced0d603d0b2cc8 (diff) | |
o kill colon-separated paths in *libexp, they confuse too many modules
o kill MakeMaker hack (no longer needed)
o define APPLLIB_EXP to be /usr/local/libdata/perl5 to let users
override standard modules if they want
The perl search path in @INC is now:
/usr/local/libdata/perl5
/usr/libdata/perl5/i386-openbsd/5.00503
/usr/libdata/perl5
/usr/local/libdata/perl5/site_perl/i386-openbsd
/usr/local/libdata/perl5/site_perl
.
Diffstat (limited to 'gnu/usr.bin/perl/lib')
| -rw-r--r-- | gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm b/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm index 29d8309d6af..d9ceb192769 100644 --- a/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm +++ b/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm @@ -8,8 +8,8 @@ use strict; use vars qw($VERSION $Is_Mac $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos $Is_PERL_OBJECT $Verbose %pm %static $Xsubpp_Version); -$VERSION = substr q$Revision: 1.5 $, 10; -# $Id: MM_Unix.pm,v 1.5 1999/05/09 02:16:41 millert Exp $ +$VERSION = substr q$Revision: 1.6 $, 10; +# $Id: MM_Unix.pm,v 1.6 1999/05/09 16:34:10 millert Exp $ Exporter::import('ExtUtils::MakeMaker', qw( $Verbose &neatvalue)); @@ -126,7 +126,6 @@ sub catfile { return $self->canonpath($file) unless @_; my $dir = $self->catdir(@_); for ($dir) { - $_ =~ s/:.*$//; $_ .= "/" unless substr($_,length($_)-1,1) eq "/"; } return $self->canonpath($dir.$file); @@ -1604,12 +1603,7 @@ from the perl source tree. # we should also consider $ENV{PERL5LIB} here $self->{PERL_LIB} ||= $Config::Config{privlibexp}; $self->{PERL_ARCHLIB} ||= $Config::Config{archlibexp}; - foreach (split(':', $self->{PERL_ARCHLIB})) { - last if (-d ($self->{PERL_INC} = $self->catdir($_, "CORE"))); - } - # use the primary path compenents of privlibexp and archlibexp - $self->{PERL_LIB} =~ s/:.*//; - $self->{PERL_ARCHLIB} =~ s/:.*//; + $self->{PERL_INC} = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now my $perl_h; unless (-f ($perl_h = $self->catfile($self->{PERL_INC},"perl.h"))){ die qq{ |